Re: [PATCH] fujitsu-laptop: remove superfluous NULL pointer checks

Jonathan Woithe
2009-07-30T07:43:49Z

Hi Bart

> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Subject: [PATCH] fujitsu-laptop: remove superfluous NULL pointer checks
>
> This takes care of the following entries from Dan's list:
>
> drivers/platform/x86/fujitsu-laptop.c +327 set_lcd_level(13) warning: variable derefenced before check 'fujitsu'
> drivers/platform/x86/fujitsu-laptop.c +358 set_lcd_level_alt(13) warning: variable derefenced before check 'fujitsu'

I'd rather keep the test for a non-null fujitsu in there, but obviously it's
kind of pointless doing it after the first dereference. Since this fixup
overlaps with the one previously discussed with Julia I've taken the liberty
of consolidating these - I'll send the result to the list as a separate
email.

Regards
jonathan

> Reported-by: Dan Carpenter <error27@gmail.com>
> Cc: corbet@lwn.net
> Cc: eteo@redhat.com
> Cc: Julia Lawall <julia@diku.dk>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> ---
> drivers/platform/x86/fujitsu-laptop.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> Index: b/drivers/platform/x86/fujitsu-laptop.c
> ===================================================================
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -324,9 +324,6 @@ static int set_lcd_level(int level)
> if (level < 0 || level >= fujitsu->max_brightness)
> return -EINVAL;
>
> - if (!fujitsu)
> - return -EINVAL;
> -
> status = acpi_get_handle(fujitsu->acpi_handle, "SBLL", &handle);
> if (ACPI_FAILURE(status)) {
> vdbg_printk(FUJLAPTOP_DBG_ERROR, "SBLL not present\n");
> @@ -355,9 +352,6 @@ static int set_lcd_level_alt(int level)
> if (level < 0 || level >= fujitsu->max_brightness)
> return -EINVAL;
>
> - if (!fujitsu)
> - return -EINVAL;
> -
> status = acpi_get_handle(fujitsu->acpi_handle, "SBL2", &handle);
> if (ACPI_FAILURE(status)) {
> vdbg_printk(FUJLAPTOP_DBG_ERROR, "SBL2 not present\n");