提交 76d15c8f 编写于 作者: H Hans de Goede 提交者: Greg Kroah-Hartman

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: NHans de Goede <hdegoede@redhat.com>
Acked-by: NAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 62d9694a
...@@ -236,8 +236,8 @@ static int ehci_platform_probe(struct platform_device *dev) ...@@ -236,8 +236,8 @@ static int ehci_platform_probe(struct platform_device *dev)
} }
for (rst = 0; rst < EHCI_MAX_RSTS; rst++) { for (rst = 0; rst < EHCI_MAX_RSTS; rst++) {
priv->rsts[rst] = of_reset_control_get_by_index( priv->rsts[rst] = devm_reset_control_get_shared_by_index(
dev->dev.of_node, rst); &dev->dev, rst);
if (IS_ERR(priv->rsts[rst])) { if (IS_ERR(priv->rsts[rst])) {
err = PTR_ERR(priv->rsts[rst]); err = PTR_ERR(priv->rsts[rst]);
if (err == -EPROBE_DEFER) if (err == -EPROBE_DEFER)
...@@ -247,10 +247,8 @@ static int ehci_platform_probe(struct platform_device *dev) ...@@ -247,10 +247,8 @@ static int ehci_platform_probe(struct platform_device *dev)
} }
err = reset_control_deassert(priv->rsts[rst]); err = reset_control_deassert(priv->rsts[rst]);
if (err) { if (err)
reset_control_put(priv->rsts[rst]);
goto err_reset; goto err_reset;
}
} }
if (pdata->big_endian_desc) if (pdata->big_endian_desc)
...@@ -307,10 +305,8 @@ static int ehci_platform_probe(struct platform_device *dev) ...@@ -307,10 +305,8 @@ static int ehci_platform_probe(struct platform_device *dev)
if (pdata->power_off) if (pdata->power_off)
pdata->power_off(dev); pdata->power_off(dev);
err_reset: err_reset:
while (--rst >= 0) { while (--rst >= 0)
reset_control_assert(priv->rsts[rst]); reset_control_assert(priv->rsts[rst]);
reset_control_put(priv->rsts[rst]);
}
err_put_clks: err_put_clks:
while (--clk >= 0) while (--clk >= 0)
clk_put(priv->clks[clk]); clk_put(priv->clks[clk]);
...@@ -335,10 +331,8 @@ static int ehci_platform_remove(struct platform_device *dev) ...@@ -335,10 +331,8 @@ static int ehci_platform_remove(struct platform_device *dev)
if (pdata->power_off) if (pdata->power_off)
pdata->power_off(dev); 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_assert(priv->rsts[rst]);
reset_control_put(priv->rsts[rst]);
}
for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++) for (clk = 0; clk < EHCI_MAX_CLKS && priv->clks[clk]; clk++)
clk_put(priv->clks[clk]); clk_put(priv->clks[clk]);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册