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

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

diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c
index d0c1967f7597aff1517b6b2ab65103688094c8a3..20a0f2c3ca3b7d1143825ec0946aea54b60f4179 100644 (file)
--- a/drivers/acpi/hed.c
+++ b/drivers/acpi/hed.c
@@ -86,25 +86,7 @@ static struct acpi_driver acpi_hed_driver = {
                .notify = acpi_hed_notify,
        },
 };
-
-static int __init acpi_hed_init(void)
-{
-       if (acpi_disabled)
-               return -ENODEV;
-
-       if (acpi_bus_register_driver(&acpi_hed_driver) < 0)
-               return -ENODEV;
-
-       return 0;
-}
-
-static void __exit acpi_hed_exit(void)
-{
-       acpi_bus_unregister_driver(&acpi_hed_driver);
-}
-
-module_init(acpi_hed_init);
-module_exit(acpi_hed_exit);
+module_acpi_driver(acpi_hed_driver);
 
 ACPI_MODULE_NAME("hed");
 MODULE_AUTHOR("Huang Ying");