UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ehci-platform: Add support for shared reset controllers 

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>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hans de Goede 2016-06-08 18:54:40 +02:00 committed by Greg Kroah-Hartman
parent 62d9694a00
commit 76d15c8fba
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/host/ehci-platform.c
View File

@ -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]);