Re: [PATCH] Input: Delete an unnecessary check before the function call "input_free_device"

Dmitry Torokhov
2015-02-11T18:11:28Z

On Thu, Feb 05, 2015 at 05:40:20PM +0100, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Thu, 5 Feb 2015 17:35:35 +0100
>
> The input_free_device() function tests whether its argument is NULL and then
> returns immediately. Thus the test around the call is not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Applied, thank you.

> ---
> drivers/input/joystick/adi.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
> index b784257..d09cefa 100644
> --- a/drivers/input/joystick/adi.c
> +++ b/drivers/input/joystick/adi.c
> @@ -535,8 +535,7 @@ static int adi_connect(struct gameport *gameport, struct gameport_driver *drv)
> }
> }
> fail2: for (i = 0; i < 2; i++)
> - if (port->adi[i].dev)
> - input_free_device(port->adi[i].dev);
> + input_free_device(port->adi[i].dev);
> gameport_close(gameport);
> fail1: gameport_set_drvdata(gameport, NULL);
> kfree(port);
> --
> 2.2.2
>

--
Dmitry