WMI: Remove unnecessary null test
authorHimangi Saraogi <himangi774@gmail.com>
Tue, 15 Jul 2014 17:19:11 +0000 (22:49 +0530)
committerMatthew Garrett <matthew.garrett@nebula.com>
Sat, 16 Aug 2014 08:23:51 +0000 (01:23 -0700)
This patch removes the null test on block. block is initialized at the
beginning of the function to &wblock->gblock. Since wblock is
dereferenced prior to the null test, wblock must be a valid pointer,
and &wblock->gblock cannot be null.

The following Coccinelle script is used for detecting the change:

@r@
expression e,f;
identifier g,y;
statement S1,S2;
@@

*e = &f->g
<+...
 f->y
 ...+>
*if (e != NULL || ...)
 S1 else S2

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
drivers/platform/x86/wmi.c

index 43d13295e63d53a50b62dae995d3a63b7e112a3a..737e56d46f61950826419bbef2d9fb66d69abcc1 100644 (file)
@@ -256,10 +256,6 @@ static acpi_status wmi_method_enable(struct wmi_block *wblock, int enable)
        block = &wblock->gblock;
        handle = wblock->handle;
 
-       if (!block)
-               return AE_NOT_EXIST;
-
-
        snprintf(method, 5, "WE%02X", block->notify_id);
        status = acpi_execute_simple_method(handle, method, enable);