fujitsu-laptop: Correct redundant test
authorJulia Lawall <julia@diku.dk>
Fri, 31 Jul 2009 08:42:00 +0000 (18:12 +0930)
committerLen Brown <len.brown@intel.com>
Fri, 28 Aug 2009 19:17:08 +0000 (15:17 -0400)
device and acpi_driver_data(device) were tested just a few lines above.

A simplified version of the semantic match that finds this problem is as
follows: (http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r exists@
local idexpression x;
expression E;
@@

if (x == NULL || ...) { ... when forall
   return ...; }
.. when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
*x == NULL
|
*x != NULL
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/platform/x86/fujitsu-laptop.c

index 4c8897a..0d42f44 100644 (file)
@@ -745,9 +745,6 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 
        fujitsu = acpi_driver_data(device);
 
-       if (!device || !acpi_driver_data(device))
-               return -EINVAL;
-
        fujitsu->acpi_handle = NULL;
 
        return 0;