summaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@linux.intel.com>2012-09-07 10:31:48 +0300
committerLen Brown <len.brown@intel.com>2012-09-21 13:41:37 -0400
commit01d1775301f950ea463e2184b67b6bc9b68f5bae (patch)
treea5675d564b4aab362d2c835769b1c387d0f95b52 /drivers/platform/x86
parent15165594da65f7b6c70fd47f27c2d3b0a23c9ca8 (diff)
downloadblackbird-op-linux-01d1775301f950ea463e2184b67b6bc9b68f5bae.tar.gz
blackbird-op-linux-01d1775301f950ea463e2184b67b6bc9b68f5bae.zip
toshiba_bluetooth: convert to module_acpi_driver()
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/toshiba_bluetooth.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/platform/x86/toshiba_bluetooth.c b/drivers/platform/x86/toshiba_bluetooth.c
index 5e5d6317d690..e95be0b74859 100644
--- a/drivers/platform/x86/toshiba_bluetooth.c
+++ b/drivers/platform/x86/toshiba_bluetooth.c
@@ -122,30 +122,10 @@ static int toshiba_bt_rfkill_add(struct acpi_device *device)
return result;
}
-static int __init toshiba_bt_rfkill_init(void)
-{
- int result;
-
- result = acpi_bus_register_driver(&toshiba_bt_rfkill_driver);
- if (result < 0) {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
- "Error registering driver\n"));
- return result;
- }
-
- return 0;
-}
-
static int toshiba_bt_rfkill_remove(struct acpi_device *device, int type)
{
/* clean up */
return 0;
}
-static void __exit toshiba_bt_rfkill_exit(void)
-{
- acpi_bus_unregister_driver(&toshiba_bt_rfkill_driver);
-}
-
-module_init(toshiba_bt_rfkill_init);
-module_exit(toshiba_bt_rfkill_exit);
+module_acpi_driver(toshiba_bt_rfkill_driver);
OpenPOWER on IntegriCloud