Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[deliverable/linux.git] / drivers / pinctrl / pinctrl-at91.c

diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 0d2fc0cff35ee6216ef5e62a77376e63cb2675e7..47b625b1b789fb0c10c08a940fd0766bcf93358a 100644 (file)
--- a/drivers/pinctrl/pinctrl-at91.c
+++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1828,20 +1828,20 @@ static struct platform_driver at91_pinctrl_driver = {
        .remove = at91_pinctrl_remove,
 };
 
+static struct platform_driver * const drivers[] = {
+       &at91_gpio_driver,
+       &at91_pinctrl_driver,
+};
+
 static int __init at91_pinctrl_init(void)
 {
-       int ret;
-
-       ret = platform_driver_register(&at91_gpio_driver);
-       if (ret)
-               return ret;
-       return platform_driver_register(&at91_pinctrl_driver);
+       return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
 }
 arch_initcall(at91_pinctrl_init);
 
 static void __exit at91_pinctrl_exit(void)
 {
-       platform_driver_unregister(&at91_pinctrl_driver);
+       platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
 }
 
 module_exit(at91_pinctrl_exit);