* [PATCH 1/2] pinctrl: adi2: Use platform_register/unregister_drivers()
@ 2015-12-02 16:31 Thierry Reding
2015-12-02 16:31 ` [PATCH 2/2] pinctrl: at91: " Thierry Reding
2015-12-10 22:46 ` [PATCH 1/2] pinctrl: adi2: " Linus Walleij
0 siblings, 2 replies; 4+ messages in thread
From: Thierry Reding @ 2015-12-02 16:31 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-gpio, linux-kernel
From: Thierry Reding <treding@nvidia.com>
These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/pinctrl/pinctrl-adi2.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index fd342dffe4dc..8e9e8eab59ba 100644
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -1102,32 +1102,24 @@ static struct platform_driver adi_gpio_driver = {
},
};
+static struct platform_driver * const drivers[] = {
+ &adi_pinctrl_driver,
+ &adi_gpio_pint_driver,
+ &adi_gpio_driver,
+};
+
static int __init adi_pinctrl_setup(void)
{
int ret;
- ret = platform_driver_register(&adi_pinctrl_driver);
+ ret = platform_register_drivers(drivers, ARRAY_SIZE(drivers));
if (ret)
return ret;
- ret = platform_driver_register(&adi_gpio_pint_driver);
- if (ret)
- goto pint_error;
-
- ret = platform_driver_register(&adi_gpio_driver);
- if (ret)
- goto gpio_error;
-
#ifdef CONFIG_PM
register_syscore_ops(&gpio_pm_syscore_ops);
#endif
- return ret;
-gpio_error:
- platform_driver_unregister(&adi_gpio_pint_driver);
-pint_error:
- platform_driver_unregister(&adi_pinctrl_driver);
-
- return ret;
+ return 0;
}
arch_initcall(adi_pinctrl_setup);
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] pinctrl: at91: Use platform_register/unregister_drivers()
2015-12-02 16:31 [PATCH 1/2] pinctrl: adi2: Use platform_register/unregister_drivers() Thierry Reding
@ 2015-12-02 16:31 ` Thierry Reding
2015-12-10 22:52 ` Linus Walleij
2015-12-10 22:46 ` [PATCH 1/2] pinctrl: adi2: " Linus Walleij
1 sibling, 1 reply; 4+ messages in thread
From: Thierry Reding @ 2015-12-02 16:31 UTC (permalink / raw)
To: Linus Walleij; +Cc: linux-gpio, linux-kernel
From: Thierry Reding <treding@nvidia.com>
These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/pinctrl/pinctrl-at91.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
index 0d2fc0cff35e..47b625b1b789 100644
--- 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);
--
2.5.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] pinctrl: adi2: Use platform_register/unregister_drivers()
2015-12-02 16:31 [PATCH 1/2] pinctrl: adi2: Use platform_register/unregister_drivers() Thierry Reding
2015-12-02 16:31 ` [PATCH 2/2] pinctrl: at91: " Thierry Reding
@ 2015-12-10 22:46 ` Linus Walleij
1 sibling, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2015-12-10 22:46 UTC (permalink / raw)
To: Thierry Reding; +Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
On Wed, Dec 2, 2015 at 5:31 PM, Thierry Reding <thierry.reding@gmail.com> wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> These new helpers simplify implementing multi-driver modules and
> properly handle failure to register one driver by unregistering all
> previously registered drivers.
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
Patch applied.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-10 22:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-02 16:31 [PATCH 1/2] pinctrl: adi2: Use platform_register/unregister_drivers() Thierry Reding
2015-12-02 16:31 ` [PATCH 2/2] pinctrl: at91: " Thierry Reding
2015-12-10 22:52 ` Linus Walleij
2015-12-10 22:46 ` [PATCH 1/2] pinctrl: adi2: " Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).