[PATCH] WMI: Remove unnecessary null test

From: Himangi Saraogi
Date: Tue Jul 15 2014 - 13:19:31 EST

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:

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

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

Signed-off-by: Himangi Saraogi <himangi774@xxxxxxxxx>
To send to: Matthew Garrett <matthew.garrett@xxxxxxxxxx>,platform-driver-x86@xxxxxxxxxxxxxxx,linux-kernel@xxxxxxxxxxxxxxx
drivers/platform/x86/wmi.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 43d1329..737e56d 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -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);


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/