Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / drivers / power / tosa_battery.c

diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c
index ada86a4f50e2f8e34a9ad6c2039a56be599a6b92..28bbe7e094e36a7695ffaf4a81e3e3e50dbf5ca4 100644 (file)
--- a/drivers/power/tosa_battery.c
+++ b/drivers/power/tosa_battery.c
@@ -438,18 +438,7 @@ static struct platform_driver tosa_bat_driver = {
        .resume         = tosa_bat_resume,
 };
 
-static int __init tosa_bat_init(void)
-{
-       return platform_driver_register(&tosa_bat_driver);
-}
-
-static void __exit tosa_bat_exit(void)
-{
-       platform_driver_unregister(&tosa_bat_driver);
-}
-
-module_init(tosa_bat_init);
-module_exit(tosa_bat_exit);
+module_platform_driver(tosa_bat_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Dmitry Baryshkov");