Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2a1d36c authored by Alan Jenkins's avatar Alan Jenkins Committed by Len Brown
Browse files

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: default avatarAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 13f70029

drivers/platform/x86/eeepc-laptop.c

+19 −23
Original line number Diff line number Diff line
@@ -662,13 +662,12 @@ 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;

}



static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,

				    u8 *value)
@@ -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,7 +750,6 @@ 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

		 */
@@ -767,7 +763,7 @@ static void eeepc_hotk_notify(struct acpi_device *device, u32 event) 
			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) {