Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1197186

Re: [PATCH 05/15] drivers: input: Drop unlikely before IS_ERR(_OR_NULL)

Show all headers | View raw

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.

> 
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

Re: [PATCH 05/15] drivers: input: Drop unlikely before  IS_ERR(_OR_NULL) Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2015-07-31 19:00 +0200
  Re: [PATCH 05/15] drivers: input: Drop unlikely before  IS_ERR(_OR_NULL) Viresh Kumar <viresh.kumar@linaro.org> - 2015-08-01 13:30 +0200
    Re: [PATCH 05/15] drivers: input: Drop unlikely before IS_ERR(_OR_NULL) Pali Rohár <pali.rohar@gmail.com> - 2015-08-01 13:50 +0200
      Re: [PATCH 05/15] drivers: input: Drop unlikely before IS_ERR(_OR_NULL) Pali Rohár <pali.rohar@gmail.com> - 2015-08-02 18:00 +0200
      Re: [PATCH 05/15] drivers: input: Drop unlikely before  IS_ERR(_OR_NULL) Pavel Machek <pavel@ucw.cz> - 2015-08-02 17:50 +0200

csiph-web