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

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

diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c
index c32e6f83c7a85417c3d1ce6870da3ea204195a70..987332b71d8de3ddfbfab813800cac880e48e53d 100644 (file)
--- a/drivers/power/wm831x_power.c
+++ b/drivers/power/wm831x_power.c
@@ -655,17 +655,7 @@ static struct platform_driver wm831x_power_driver = {
        },
 };
 
-static int __init wm831x_power_init(void)
-{
-       return platform_driver_register(&wm831x_power_driver);
-}
-module_init(wm831x_power_init);
-
-static void __exit wm831x_power_exit(void)
-{
-       platform_driver_unregister(&wm831x_power_driver);
-}
-module_exit(wm831x_power_exit);
+module_platform_driver(wm831x_power_driver);
 
 MODULE_DESCRIPTION("Power supply driver for WM831x PMICs");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");