eeepc-laptop: remove redundant NULL checks

eeepc_hotk_notify() cannot be called with ehotk == NULL or bd == NULL.
We check both variables for allocation failure and would bail out before
the notifier is registered.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index abd7389a449300a96af9b63d9cb59b89ba02f952..f6b7796b24ca97cf36d5d1641d389ee7d1f0262f 100644 (file)
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -662,12 +662,11 @@ static int notify_brn(void)
 {
        /* returns the *previous* brightness, or -1 */
        struct backlight_device *bd = eeepc_backlight_device;
-       if (bd) {
-               int old = bd->props.brightness;
-               backlight_force_update(bd, BACKLIGHT_UPDATE_HOTKEY);
-               return old;
-       }
-       return -1;
+       int old = bd->props.brightness;
+
+       backlight_force_update(bd, BACKLIGHT_UPDATE_HOTKEY);
+
+       return old;
 }
 
 static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,
@@ -741,8 +740,6 @@ static void eeepc_hotk_notify(struct acpi_device *device, u32 event)
        u16 count;
        int brn = -ENODEV;
 
-       if (!ehotk)
-               return;
        if (event > ACPI_MAX_SYS_NOTIFY)
                return;
        if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
@@ -753,21 +750,20 @@ static void eeepc_hotk_notify(struct acpi_device *device, u32 event)
                                        dev_name(&ehotk->device->dev), event,
                                        count);
        if (ehotk->inputdev) {
-               if (brn != -ENODEV) {
-                       /* brightness-change events need special
-                        * handling for conversion to key events
-                        */
-                       if (brn < 0)
-                               brn = event;
-                       else
-                               brn += NOTIFY_BRN_MIN;
-                       if (event < brn)
-                               event = NOTIFY_BRN_MIN; /* brightness down */
-                       else if (event > brn)
-                               event = NOTIFY_BRN_MIN + 2; /* ... up */
-                       else
-                               event = NOTIFY_BRN_MIN + 1; /* ... unchanged */
-               }
+               /* brightness-change events need special
+                * handling for conversion to key events
+                */
+               if (brn < 0)
+                       brn = event;
+               else
+                       brn += NOTIFY_BRN_MIN;
+               if (event < brn)
+                       event = NOTIFY_BRN_MIN; /* brightness down */
+               else if (event > brn)
+                       event = NOTIFY_BRN_MIN + 2; /* ... up */
+               else
+                       event = NOTIFY_BRN_MIN + 1; /* ... unchanged */
+
                key = eepc_get_entry_by_scancode(event);
                if (key) {
                        switch (key->type) {