提交 af59a8b1 编写于 作者: P Peter Chen 提交者: Greg Kroah-Hartman

usb: chipidea: imx: remove PHY operations

Since the PHY operations are moved to core, delete the related
code at glue layer.
Signed-off-by: NPeter Chen <peter.chen@freescale.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 74475ede
...@@ -108,14 +108,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ...@@ -108,14 +108,8 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
} }
data->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "fsl,usbphy", 0); data->phy = devm_usb_get_phy_by_phandle(&pdev->dev, "fsl,usbphy", 0);
if (!IS_ERR(data->phy)) { if (IS_ERR(data->phy)) {
ret = usb_phy_init(data->phy); ret = PTR_ERR(data->phy);
if (ret) {
dev_err(&pdev->dev, "unable to init phy: %d\n", ret);
goto err_clk;
}
} else if (PTR_ERR(data->phy) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER;
goto err_clk; goto err_clk;
} }
...@@ -131,7 +125,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ...@@ -131,7 +125,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n",
ret); ret);
goto err_phy; goto err_clk;
} }
} }
...@@ -143,7 +137,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ...@@ -143,7 +137,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Can't register ci_hdrc platform device, err=%d\n", "Can't register ci_hdrc platform device, err=%d\n",
ret); ret);
goto err_phy; goto err_clk;
} }
if (data->usbmisc_data) { if (data->usbmisc_data) {
...@@ -164,9 +158,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) ...@@ -164,9 +158,6 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
disable_device: disable_device:
ci_hdrc_remove_device(data->ci_pdev); ci_hdrc_remove_device(data->ci_pdev);
err_phy:
if (data->phy)
usb_phy_shutdown(data->phy);
err_clk: err_clk:
clk_disable_unprepare(data->clk); clk_disable_unprepare(data->clk);
return ret; return ret;
...@@ -178,10 +169,6 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev) ...@@ -178,10 +169,6 @@ static int ci_hdrc_imx_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
ci_hdrc_remove_device(data->ci_pdev); ci_hdrc_remove_device(data->ci_pdev);
if (data->phy)
usb_phy_shutdown(data->phy);
clk_disable_unprepare(data->clk); clk_disable_unprepare(data->clk);
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册