From 4e0923a2504a3105a3ab330d14695e94ba234c4f Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Fri, 7 Sep 2012 10:31:48 +0300 Subject: [PATCH] --- yaml --- r: 331738 b: refs/heads/master c: 01d1775301f950ea463e2184b67b6bc9b68f5bae h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/platform/x86/toshiba_bluetooth.c | 22 +------------------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 10a142c8f8bb..ea8dee732bd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15165594da65f7b6c70fd47f27c2d3b0a23c9ca8 +refs/heads/master: 01d1775301f950ea463e2184b67b6bc9b68f5bae diff --git a/trunk/drivers/platform/x86/toshiba_bluetooth.c b/trunk/drivers/platform/x86/toshiba_bluetooth.c index 5e5d6317d690..e95be0b74859 100644 --- a/trunk/drivers/platform/x86/toshiba_bluetooth.c +++ b/trunk/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);