From d732ff03a532c9bf2588f6dda4f44faf1e5df13b Mon Sep 17 00:00:00 2001 From: Mika Westerberg Date: Fri, 7 Sep 2012 10:31:45 +0300 Subject: [PATCH] --- yaml --- r: 331735 b: refs/heads/master c: 46f6471c2c5ed68694df8f453794d5de664e70af h: refs/heads/master i: 331733: 242c1463c881a9411651cb4d79fe949983c35230 331731: 737b80e61250b028842f9f3a38c0690c8d4b3c61 331727: dc277e452e24ec2402523f6c6f8104ca8a92e5de v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/hp_accel.c | 25 +------------------------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/[refs] b/[refs] index 208e6e6d2c02..fe45008f0069 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f06efccf4d4162db957983bc8a66073ec4735a38 +refs/heads/master: 46f6471c2c5ed68694df8f453794d5de664e70af diff --git a/trunk/drivers/platform/x86/hp_accel.c b/trunk/drivers/platform/x86/hp_accel.c index 6b9af989632b..18d74f29dcb2 100644 --- a/trunk/drivers/platform/x86/hp_accel.c +++ b/trunk/drivers/platform/x86/hp_accel.c @@ -382,31 +382,8 @@ static struct acpi_driver lis3lv02d_driver = { }, .drv.pm = HP_ACCEL_PM, }; - -static int __init lis3lv02d_init_module(void) -{ - int ret; - - if (acpi_disabled) - return -ENODEV; - - ret = acpi_bus_register_driver(&lis3lv02d_driver); - if (ret < 0) - return ret; - - pr_info("driver loaded\n"); - - return 0; -} - -static void __exit lis3lv02d_exit_module(void) -{ - acpi_bus_unregister_driver(&lis3lv02d_driver); -} +module_acpi_driver(lis3lv02d_driver); MODULE_DESCRIPTION("Glue between LIS3LV02Dx and HP ACPI BIOS and support for disk protection LED."); MODULE_AUTHOR("Yan Burman, Eric Piel, Pavel Machek"); MODULE_LICENSE("GPL"); - -module_init(lis3lv02d_init_module); -module_exit(lis3lv02d_exit_module);