p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eeepc-laptop: clean up control flow in *_rfkill_notifier 

Handle errors immediately in eeepc_register_rfkill_notifier and
eeepc_unregister_rfkill_notifier. This clears up the control flow for the
reader. It also removes unnecessary indentation.

Signed-off-by: Frans Klaver <fransklaver@gmail.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
This commit is contained in:
Frans Klaver 2014-09-21 00:22:17 +02:00 committed by Darren Hart
parent d48690383f
commit 557b454971
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/platform/x86/eeepc-laptop.c
View File

@ -668,7 +668,9 @@ static int eeepc_register_rfkill_notifier(struct eeepc_laptop *eeepc,
status = acpi_get_handle(NULL, node, &handle); status = acpi_get_handle(NULL, node, &handle);
if (ACPI_SUCCESS(status)) { if (ACPI_FAILURE(status))
return -ENODEV;
status = acpi_install_notify_handler(handle, status = acpi_install_notify_handler(handle,
ACPI_SYSTEM_NOTIFY, ACPI_SYSTEM_NOTIFY,
eeepc_rfkill_notify, eeepc_rfkill_notify,
@ -681,10 +683,6 @@ static int eeepc_register_rfkill_notifier(struct eeepc_laptop *eeepc,
* changed during setup. * changed during setup.
*/ */
eeepc_rfkill_hotplug(eeepc, handle); eeepc_rfkill_hotplug(eeepc, handle);
} else {
return -ENODEV;
}
return 0; return 0;
} }
@ -696,7 +694,9 @@ static void eeepc_unregister_rfkill_notifier(struct eeepc_laptop *eeepc,
status = acpi_get_handle(NULL, node, &handle); status = acpi_get_handle(NULL, node, &handle);
if (ACPI_SUCCESS(status)) { if (ACPI_FAILURE(status))
return;
status = acpi_remove_notify_handler(handle, status = acpi_remove_notify_handler(handle,
ACPI_SYSTEM_NOTIFY, ACPI_SYSTEM_NOTIFY,
eeepc_rfkill_notify); eeepc_rfkill_notify);
@ -709,7 +709,6 @@ static void eeepc_unregister_rfkill_notifier(struct eeepc_laptop *eeepc,
* eeepc_unregister_rfkill_notifier() * eeepc_unregister_rfkill_notifier()
*/ */
eeepc_rfkill_hotplug(eeepc, handle); eeepc_rfkill_hotplug(eeepc, handle);
}
} }
static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot, static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,