Merge tag 'for-linus-v3.6-rc1' of git://oss.sgi.com/xfs/xfs

[deliverable/linux.git] / drivers / power / gpio-charger.c

diff --git a/drivers/power/gpio-charger.c b/drivers/power/gpio-charger.c
index a64b8854cfd59dcb640202e56044e77ff9e13605..8672c9177dd70f481937233fcd5fe0083bd8796c 100644 (file)
--- a/drivers/power/gpio-charger.c
+++ b/drivers/power/gpio-charger.c
@@ -185,17 +185,7 @@ static struct platform_driver gpio_charger_driver = {
        },
 };
 
-static int __init gpio_charger_init(void)
-{
-       return platform_driver_register(&gpio_charger_driver);
-}
-module_init(gpio_charger_init);
-
-static void __exit gpio_charger_exit(void)
-{
-       platform_driver_unregister(&gpio_charger_driver);
-}
-module_exit(gpio_charger_exit);
+module_platform_driver(gpio_charger_driver);
 
 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
 MODULE_DESCRIPTION("Driver for chargers which report their online status through a GPIO");