Input: alps - Remove unnecessary unlikely
diff mbox series

Message ID 1570869407-41262-1-git-send-email-zhengbin13@huawei.com
State New
Headers show
Series
  • Input: alps - Remove unnecessary unlikely
Related show

Commit Message

zhengbin Oct. 12, 2019, 8:36 a.m. UTC
IS_ERR_OR_NULL already contains unlikely, there is no need
for another one.

Signed-off-by: zhengbin <zhengbin13@huawei.com>
---
 drivers/input/mouse/alps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.7.4

Comments

zhengbin Nov. 13, 2019, 3:11 a.m. UTC | #1
ping

On 2019/10/12 16:36, zhengbin wrote:
> IS_ERR_OR_NULL already contains unlikely, there is no need
> for another one.
>
> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> ---
>  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 34700ed..ed16614 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -1476,7 +1476,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.7.4
>
>
> .
>
Dmitry Torokhov Nov. 13, 2019, 8:05 a.m. UTC | #2
On Wed, Nov 13, 2019 at 11:11:04AM +0800, zhengbin (A) wrote:
> ping

No, the preference is to keep the code here as is, thank you.

> 
> On 2019/10/12 16:36, zhengbin wrote:
> > IS_ERR_OR_NULL already contains unlikely, there is no need
> > for another one.
> >
> > Signed-off-by: zhengbin <zhengbin13@huawei.com>
> > ---
> >  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 34700ed..ed16614 100644
> > --- a/drivers/input/mouse/alps.c
> > +++ b/drivers/input/mouse/alps.c
> > @@ -1476,7 +1476,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.7.4
> >
> >
> > .
> >
>

Patch
diff mbox series

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 34700ed..ed16614 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -1476,7 +1476,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,