Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next

[~andy/linux] / drivers / acpi / sbshc.c

diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index f8d2a472795c588b8eee51cfa1319fa98a6e132d..cf6129a8af7c97619809b19e6fc46a5be010dd66 100644 (file)
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -310,23 +310,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");