2014-11-19 17:39:05

by SF Markus Elfring

Subject: [PATCH 1/1] HID-picoLCD: Deletion of unnecessary checks before three function calls

From: Markus Elfring <[email protected]>
Date: Wed, 19 Nov 2014 18:30:22 +0100

The functions backlight_device_unregister(), lcd_device_unregister() and
rc_unregister_device() test whether their argument is NULL and then
return immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[email protected]>
---
drivers/hid/hid-picolcd_backlight.c | 3 +--
drivers/hid/hid-picolcd_cir.c | 3 +--
drivers/hid/hid-picolcd_lcd.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/hid/hid-picolcd_backlight.c b/drivers/hid/hid-picolcd_backlight.c
index a32c5f8..808807a 100644
--- a/drivers/hid/hid-picolcd_backlight.c
+++ b/drivers/hid/hid-picolcd_backlight.c
@@ -94,8 +94,7 @@ void picolcd_exit_backlight(struct picolcd_data *data)
struct backlight_device *bdev = data->backlight;

data->backlight = NULL;
- if (bdev)
- backlight_device_unregister(bdev);
+ backlight_device_unregister(bdev);
}

int picolcd_resume_backlight(struct picolcd_data *data)
diff --git a/drivers/hid/hid-picolcd_cir.c b/drivers/hid/hid-picolcd_cir.c
index 045f8eb..9628651 100644
--- a/drivers/hid/hid-picolcd_cir.c
+++ b/drivers/hid/hid-picolcd_cir.c
@@ -145,7 +145,6 @@ void picolcd_exit_cir(struct picolcd_data *data)
struct rc_dev *rdev = data->rc_dev;

data->rc_dev = NULL;
- if (rdev)
- rc_unregister_device(rdev);
+ rc_unregister_device(rdev);
}

diff --git a/drivers/hid/hid-picolcd_lcd.c b/drivers/hid/hid-picolcd_lcd.c
index 89821c2..22dcbe1 100644
--- a/drivers/hid/hid-picolcd_lcd.c
+++ b/drivers/hid/hid-picolcd_lcd.c
@@ -92,8 +92,7 @@ void picolcd_exit_lcd(struct picolcd_data *data)
struct lcd_device *ldev = data->lcd;

data->lcd = NULL;
- if (ldev)
- lcd_device_unregister(ldev);
+ lcd_device_unregister(ldev);
}

int picolcd_resume_lcd(struct picolcd_data *data)
--
2.1.3

2015-06-28 11:55:13

by SF Markus Elfring

Subject: Re: [PATCH] HID-picoLCD: Deletion of unnecessary checks before three function calls

> From: Markus Elfring <[email protected]>
> Date: Wed, 19 Nov 2014 18:30:22 +0100
>
> The functions backlight_device_unregister(), lcd_device_unregister() and
> rc_unregister_device() test whether their argument is NULL and then
> return immediately. Thus the test around the call is not needed.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <[email protected]>
> ---
> drivers/hid/hid-picolcd_backlight.c | 3 +--
> drivers/hid/hid-picolcd_cir.c | 3 +--
> drivers/hid/hid-picolcd_lcd.c | 3 +--
> 3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/hid/hid-picolcd_backlight.c b/drivers/hid/hid-picolcd_backlight.c
> index a32c5f8..808807a 100644
> --- a/drivers/hid/hid-picolcd_backlight.c
> +++ b/drivers/hid/hid-picolcd_backlight.c
> @@ -94,8 +94,7 @@ void picolcd_exit_backlight(struct picolcd_data *data)
> struct backlight_device *bdev = data->backlight;
>
> data->backlight = NULL;
> - if (bdev)
> - backlight_device_unregister(bdev);
> + backlight_device_unregister(bdev);
> }
>
> int picolcd_resume_backlight(struct picolcd_data *data)
> diff --git a/drivers/hid/hid-picolcd_cir.c b/drivers/hid/hid-picolcd_cir.c
> index 045f8eb..9628651 100644
> --- a/drivers/hid/hid-picolcd_cir.c
> +++ b/drivers/hid/hid-picolcd_cir.c
> @@ -145,7 +145,6 @@ void picolcd_exit_cir(struct picolcd_data *data)
> struct rc_dev *rdev = data->rc_dev;
>
> data->rc_dev = NULL;
> - if (rdev)
> - rc_unregister_device(rdev);
> + rc_unregister_device(rdev);
> }
>
> diff --git a/drivers/hid/hid-picolcd_lcd.c b/drivers/hid/hid-picolcd_lcd.c
> index 89821c2..22dcbe1 100644
> --- a/drivers/hid/hid-picolcd_lcd.c
> +++ b/drivers/hid/hid-picolcd_lcd.c
> @@ -92,8 +92,7 @@ void picolcd_exit_lcd(struct picolcd_data *data)
> struct lcd_device *ldev = data->lcd;
>
> data->lcd = NULL;
> - if (ldev)
> - lcd_device_unregister(ldev);
> + lcd_device_unregister(ldev);
> }
>
> int picolcd_resume_lcd(struct picolcd_data *data)
>

Would you like to integrate this update suggestion
into another source code repository?

Regards,
Markus

2015-06-29 06:35:42

by Bruno Prémont

Subject: Re: [PATCH] HID-picoLCD: Deletion of unnecessary checks before three function calls

On Sun, 28 Jun 2015 13:54:56 +0200 SF Markus Elfring wrote:
> > From: Markus Elfring <[email protected]>
> > Date: Wed, 19 Nov 2014 18:30:22 +0100
> >
> > The functions backlight_device_unregister(), lcd_device_unregister() and
> > rc_unregister_device() test whether their argument is NULL and then
> > return immediately. Thus the test around the call is not needed.
> >
> > This issue was detected by using the Coccinelle software.
> >
> > Signed-off-by: Markus Elfring <[email protected]>
> > ---
> > drivers/hid/hid-picolcd_backlight.c | 3 +--
> > drivers/hid/hid-picolcd_cir.c | 3 +--
> > drivers/hid/hid-picolcd_lcd.c | 3 +--
> > 3 files changed, 3 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/hid/hid-picolcd_backlight.c b/drivers/hid/hid-picolcd_backlight.c
> > index a32c5f8..808807a 100644
> > --- a/drivers/hid/hid-picolcd_backlight.c
> > +++ b/drivers/hid/hid-picolcd_backlight.c
> > @@ -94,8 +94,7 @@ void picolcd_exit_backlight(struct picolcd_data *data)
> > struct backlight_device *bdev = data->backlight;
> >
> > data->backlight = NULL;
> > - if (bdev)
> > - backlight_device_unregister(bdev);
> > + backlight_device_unregister(bdev);
> > }
> >
> > int picolcd_resume_backlight(struct picolcd_data *data)
> > diff --git a/drivers/hid/hid-picolcd_cir.c b/drivers/hid/hid-picolcd_cir.c
> > index 045f8eb..9628651 100644
> > --- a/drivers/hid/hid-picolcd_cir.c
> > +++ b/drivers/hid/hid-picolcd_cir.c
> > @@ -145,7 +145,6 @@ void picolcd_exit_cir(struct picolcd_data *data)
> > struct rc_dev *rdev = data->rc_dev;
> >
> > data->rc_dev = NULL;
> > - if (rdev)
> > - rc_unregister_device(rdev);
> > + rc_unregister_device(rdev);
> > }
> >
> > diff --git a/drivers/hid/hid-picolcd_lcd.c b/drivers/hid/hid-picolcd_lcd.c
> > index 89821c2..22dcbe1 100644
> > --- a/drivers/hid/hid-picolcd_lcd.c
> > +++ b/drivers/hid/hid-picolcd_lcd.c
> > @@ -92,8 +92,7 @@ void picolcd_exit_lcd(struct picolcd_data *data)
> > struct lcd_device *ldev = data->lcd;
> >
> > data->lcd = NULL;
> > - if (ldev)
> > - lcd_device_unregister(ldev);
> > + lcd_device_unregister(ldev);
> > }
> >
> > int picolcd_resume_lcd(struct picolcd_data *data)
> >
>
> Would you like to integrate this update suggestion
> into another source code repository?

Sorry for forgetting about this patch.

Looks good to me:
Reviewed-by: Bruno Prémont <[email protected]>

Jiri, can you take it?

Best regards,
Bruno

> Regards,
> Markus

2015-06-29 12:05:56

by Jiri Kosina

Subject: Re: [PATCH] HID-picoLCD: Deletion of unnecessary checks before three function calls

On Mon, 29 Jun 2015, Bruno Prémont wrote:

> Sorry for forgetting about this patch.
>
> Looks good to me:
> Reviewed-by: Bruno Prémont <[email protected]>
>
> Jiri, can you take it?

Could either of you please bounce me the original patch? I don't think
I've seen in in my mailbox (or it's too long time ago).

Thanks,

--
Jiri Kosina
SUSE Labs