diff options
Diffstat (limited to 'drivers/acpi/sbshc.c')
| -rw-r--r-- | drivers/acpi/sbshc.c | 26 | 
1 files changed, 5 insertions, 21 deletions
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index f8be23b6c12..26e5b506052 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c @@ -8,11 +8,11 @@   * the Free Software Foundation version 2.   */ -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> +#include <linux/acpi.h>  #include <linux/wait.h>  #include <linux/slab.h>  #include <linux/delay.h> +#include <linux/module.h>  #include <linux/interrupt.h>  #include "sbshc.h" @@ -32,7 +32,7 @@ struct acpi_smb_hc {  };  static int acpi_smbus_hc_add(struct acpi_device *device); -static int acpi_smbus_hc_remove(struct acpi_device *device, int type); +static int acpi_smbus_hc_remove(struct acpi_device *device);  static const struct acpi_device_id sbs_device_ids[] = {  	{"ACPI0001", 0}, @@ -295,7 +295,7 @@ static int acpi_smbus_hc_add(struct acpi_device *device)  extern void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit); -static int acpi_smbus_hc_remove(struct acpi_device *device, int type) +static int acpi_smbus_hc_remove(struct acpi_device *device)  {  	struct acpi_smb_hc *hc; @@ -309,23 +309,7 @@ static int acpi_smbus_hc_remove(struct acpi_device *device, int type)  	return 0;  } -static int __init acpi_smb_hc_init(void) -{ -	int result; - -	result = acpi_bus_register_driver(&acpi_smb_hc_driver); -	if (result < 0) -		return -ENODEV; -	return 0; -} - -static void __exit acpi_smb_hc_exit(void) -{ -	acpi_bus_unregister_driver(&acpi_smb_hc_driver); -} - -module_init(acpi_smb_hc_init); -module_exit(acpi_smb_hc_exit); +module_acpi_driver(acpi_smb_hc_driver);  MODULE_LICENSE("GPL");  MODULE_AUTHOR("Alexey Starikovskiy");  | 
