* [PATCH] ehci-platform: Add support for shared reset controllers
@ 2016-06-08 16:54 Hans de Goede
2016-06-08 17:47 ` Alan Stern
0 siblings, 1 reply; 3+ messages in thread
From: Hans de Goede @ 2016-06-08 16:54 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Philipp Zabel, Alan Stern, Tony Prisk, Florian Fainelli,
Maxime Ripard, linux-usb,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree,
Hans de Goede
Add support for shared platform controllers by using
devm_reset_control_get_shared_by_index instead of
of_reset_control_get_by_index.
Note we use the devm function because there is no
of_reset_control_get_shared_by_index, this also leads
to a nice cleanup of the cleanup code.
This brings the ehci-platform reset handling code inline
with ohci-platform.
Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
drivers/usb/host/ehci-platform.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index bc33f45..6816b8c 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -236,8 +236,8 @@ static int ehci_platform_probe(struct platform_device *dev)
}
for (rst = 0; rst < EHCI_MAX_RSTS; rst++) {
- priv->rsts[rst] = of_reset_control_get_by_index(
- dev->dev.of_node, rst);
+ priv->rsts[rst] = devm_reset_control_get_shared_by_index(
+ &dev->dev, rst);
if (IS_ERR(priv->rsts[rst])) {
err = PTR_ERR(priv->rsts[rst]);
if (err == -EPROBE_DEFER)
@@ -247,10 +247,8 @@ static int ehci_platform_probe(struct platform_device *dev)
}
err = reset_control_deassert(priv->rsts[rst]);
- if (err) {
- reset_control_put(priv->rsts[rst]);
+ if (err)
goto err_reset;
- }
}
if (pdata->big_endian_desc)
@@ -307,10 +305,8 @@ err_power:
if (pdata->power_off)
pdata->power_off(dev);
err_reset:
- while (--rst >= 0) {
+ while (--rst >= 0)
reset_control_assert(priv->rsts[rst]);
- reset_control_put(priv->rsts[rst]);
- }
err_put_clks:
while (--clk >= 0)
clk_put(priv->clks[clk]);
@@ -335,10 +331,8 @@ static int ehci_platform_remove(struct platform_device *dev)
if (pdata->power_off)
pdata->power_off(dev);
- for (rst = 0; rst < EHCI_MAX_RSTS && priv->rsts[rst]; rst++) {
+ for (rst = 0; rst < EHCI_MAX_RSTS && priv->rsts[rst]; rst++)
reset_control_assert(priv->rsts[rst]);
- reset_control_put(priv->rsts[rst]);
- }
for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++)
clk_put(priv->clks[clk]);
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ehci-platform: Add support for shared reset controllers
2016-06-08 16:54 [PATCH] ehci-platform: Add support for shared reset controllers Hans de Goede
@ 2016-06-08 17:47 ` Alan Stern
[not found] ` <Pine.LNX.4.44L0.1606081346340.2191-100000-IYeN2dnnYyZXsRXLowluHWD2FQJk+8+b@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Alan Stern @ 2016-06-08 17:47 UTC (permalink / raw)
To: Hans de Goede
Cc: devicetree, Florian Fainelli, Greg Kroah-Hartman, linux-usb,
Tony Prisk, Philipp Zabel, Maxime Ripard, linux-arm-kernel
On Wed, 8 Jun 2016, Hans de Goede wrote:
> Add support for shared platform controllers by using
> devm_reset_control_get_shared_by_index instead of
> of_reset_control_get_by_index.
>
> Note we use the devm function because there is no
> of_reset_control_get_shared_by_index, this also leads
> to a nice cleanup of the cleanup code.
>
> This brings the ehci-platform reset handling code inline
> with ohci-platform.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
This is just the difference between what Greg has merged and what you
wanted to add, right? If so, then
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Alan Stern
> drivers/usb/host/ehci-platform.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
> index bc33f45..6816b8c 100644
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> @@ -236,8 +236,8 @@ static int ehci_platform_probe(struct platform_device *dev)
> }
>
> for (rst = 0; rst < EHCI_MAX_RSTS; rst++) {
> - priv->rsts[rst] = of_reset_control_get_by_index(
> - dev->dev.of_node, rst);
> + priv->rsts[rst] = devm_reset_control_get_shared_by_index(
> + &dev->dev, rst);
> if (IS_ERR(priv->rsts[rst])) {
> err = PTR_ERR(priv->rsts[rst]);
> if (err == -EPROBE_DEFER)
> @@ -247,10 +247,8 @@ static int ehci_platform_probe(struct platform_device *dev)
> }
>
> err = reset_control_deassert(priv->rsts[rst]);
> - if (err) {
> - reset_control_put(priv->rsts[rst]);
> + if (err)
> goto err_reset;
> - }
> }
>
> if (pdata->big_endian_desc)
> @@ -307,10 +305,8 @@ err_power:
> if (pdata->power_off)
> pdata->power_off(dev);
> err_reset:
> - while (--rst >= 0) {
> + while (--rst >= 0)
> reset_control_assert(priv->rsts[rst]);
> - reset_control_put(priv->rsts[rst]);
> - }
> err_put_clks:
> while (--clk >= 0)
> clk_put(priv->clks[clk]);
> @@ -335,10 +331,8 @@ static int ehci_platform_remove(struct platform_device *dev)
> if (pdata->power_off)
> pdata->power_off(dev);
>
> - for (rst = 0; rst < EHCI_MAX_RSTS && priv->rsts[rst]; rst++) {
> + for (rst = 0; rst < EHCI_MAX_RSTS && priv->rsts[rst]; rst++)
> reset_control_assert(priv->rsts[rst]);
> - reset_control_put(priv->rsts[rst]);
> - }
>
> for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++)
> clk_put(priv->clks[clk]);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-08 20:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-08 16:54 [PATCH] ehci-platform: Add support for shared reset controllers Hans de Goede
2016-06-08 17:47 ` Alan Stern
[not found] ` <Pine.LNX.4.44L0.1606081346340.2191-100000-IYeN2dnnYyZXsRXLowluHWD2FQJk+8+b@public.gmane.org>
2016-06-08 20:07 ` Hans de Goede
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).