Re: [PATCH 05/15] drivers: input: Drop unlikely before IS_ERR(_OR_NULL)
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2015-07-31 16:58:48
Also in:
lkml
On Fri, Jul 31, 2015 at 02:08:25PM +0530, Viresh Kumar wrote:
IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there is no need to do that again from its callers. Drop it.
I'd rather keep it as it documents the expected behavior and double unlikely should work just fine.
quoted hunk ↗ jump to hunk
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- 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 113d6f1516a5..cef3611a4ccd 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c@@ -1365,7 +1365,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.4.0
Thanks. -- Dmitry