[PATCH] Input: ALPS - remove redundant unlikely()

IS_ERR_OR_NULL() already implies unlikely(), so it can be omitted.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 drivers/input/mouse/alps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 850b00e3ad8e..2aaceb1e9d4f 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c

@@ -1486,7 +1486,7 @@ static void alps_report_bare_ps2_packet(struct psmouse *psmouse,
 		/* On V2 devices the DualPoint Stick reports bare packets */
 		dev = priv->dev2;
 		dev2 = psmouse->dev;
-	} else if (unlikely(IS_ERR_OR_NULL(priv->dev3))) {
+	} else if (IS_ERR_OR_NULL(priv->dev3)) {
 		/* Register dev3 mouse if we received PS/2 packet first time */
 		if (!IS_ERR(priv->dev3))
 			psmouse_queue_work(psmouse, &priv->dev3_register_work,

-- 
2.13.0

On Tuesday 26 September 2017 11:29:51 Tobias Klauser wrote:

IS_ERR_OR_NULL() already implies unlikely(), so it can be omitted.

Hi Tobias! Exactly same patch was sent 2 years ago. See discussion about
it why it is not a good idea to apply it:

https://lists.gt.net/linux/kernel/2269724

-- 
Pali Rohár
pali.rohar@gmail.com

On 2017-09-26 at 11:57:06 +0200, Pali Rohár [off-list ref] wrote:

On Tuesday 26 September 2017 11:29:51 Tobias Klauser wrote:

quoted

IS_ERR_OR_NULL() already implies unlikely(), so it can be omitted.

Hi Tobias! Exactly same patch was sent 2 years ago. See discussion about
it why it is not a good idea to apply it:

https://lists.gt.net/linux/kernel/2269724

Fair enough. Thanks for the explanation.