From: Corentin Chary <corentincj@iksaif.net>
To: lenb@kernel.org
Cc: linux-acpi@vger.kernel.org, Corentin Chary <corentincj@iksaif.net>
Subject: [PATCH 01/10] eeepc-laptop: split eeepc_backlight_exit()
Date: Tue, 20 Jan 2009 16:17:40 +0100 [thread overview]
Message-ID: <1232464669-29619-2-git-send-email-corentincj@iksaif.net> (raw)
In-Reply-To: <1232464669-29619-1-git-send-email-corentincj@iksaif.net>
eeepc_backlight_exit() was doing rfkill and input stuff, which
is a nonsense. This patch add two specific exit functions, one
for input and one for rfkill.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 9d93cb9..66d611b 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -737,13 +737,21 @@ static void eeepc_backlight_exit(void)
{
if (eeepc_backlight_device)
backlight_device_unregister(eeepc_backlight_device);
- if (ehotk->inputdev)
- input_unregister_device(ehotk->inputdev);
+ eeepc_backlight_device = NULL;
+}
+
+static void eeepc_rfkill_exit(void)
+{
if (ehotk->eeepc_wlan_rfkill)
rfkill_unregister(ehotk->eeepc_wlan_rfkill);
if (ehotk->eeepc_bluetooth_rfkill)
rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
- eeepc_backlight_device = NULL;
+}
+
+static void eeepc_input_exit(void)
+{
+ if (ehotk->inputdev)
+ input_unregister_device(ehotk->inputdev);
}
static void eeepc_hwmon_exit(void)
@@ -762,6 +770,8 @@ static void eeepc_hwmon_exit(void)
static void __exit eeepc_laptop_exit(void)
{
eeepc_backlight_exit();
+ eeepc_rfkill_exit();
+ eeepc_input_exit();
eeepc_hwmon_exit();
acpi_bus_unregister_driver(&eeepc_hotk_driver);
sysfs_remove_group(&platform_device->dev.kobj,
@@ -865,6 +875,8 @@ fail_platform_driver:
fail_hwmon:
eeepc_backlight_exit();
fail_backlight:
+ eeepc_input_exit();
+ eeepc_rfkill_exit();
return result;
}
--
1.6.1
next prev parent reply other threads:[~2009-01-20 15:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-20 15:17 [PATCH 00/10] acpi4asus updates (eeepc-laptop, asus_acpi and asus-laptop) Corentin Chary
2009-01-20 15:17 ` Corentin Chary [this message]
2009-01-20 15:17 ` [PATCH 02/10] asus_acpi: Add R1F support Corentin Chary
2009-01-20 15:17 ` [PATCH 03/10] asus-laptop: use generic netlink interface Corentin Chary
2009-01-20 15:17 ` [PATCH 04/10] asus-laptop: hotkeys via the generic input interface Corentin Chary
2009-01-20 15:17 ` [PATCH 05/10] asus-laptop: update Kconfig for input layer Corentin Chary
2009-01-20 15:17 ` [PATCH 06/10] asus-laptop: fix label indentation Corentin Chary
2009-01-20 15:17 ` [PATCH 07/10] eeepc-laptop: Add support for extended hotkeys Corentin Chary
2009-01-20 15:17 ` [PATCH 08/10] eeepc-laptop: Check return values from rfkill_register Corentin Chary
2009-01-20 15:17 ` [PATCH 09/10] eeepc-laptop: Implement rfkill hotplugging in eeepc-laptop Corentin Chary
2009-01-20 15:17 ` [PATCH 10/10] eeepc-laptop: use netlink interface Corentin Chary
2009-01-20 19:41 ` [PATCH 00/10] acpi4asus updates (eeepc-laptop, asus_acpi and asus-laptop) Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1232464669-29619-2-git-send-email-corentincj@iksaif.net \
--to=corentincj@iksaif.net \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox