On Monday 18 February 2019 16:29:23 Chengguang Xu wrote: > unlikely has already included in IS_ERR_OR_NULL(), > so just remove redundant unlikely annotation. Hi! That unlikely macro is *not* redundant. Exactly same patch was sent about 2 years ago. See discussion for more details: https://www.spinics.net/lists/linux-input/msg53320.html > Signed-off-by: Chengguang Xu <cgxu519@xxxxxxx> > --- > 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 0a6f7ca883e7..791ef0f826c5 100644 > --- a/drivers/input/mouse/alps.c > +++ b/drivers/input/mouse/alps.c > @@ -1478,7 +1478,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, -- Pali Rohár pali.rohar@xxxxxxxxx
