On Mon, 28 Apr 2014, Vivek Gautam wrote:
> Add support to consume phy provided by Generic phy framework.
> Keeping the support for older usb-phy intact right now, in order
> to prevent any functionality break in absence of relevant
> device tree side change for ohci-exynos.
> Once we move to new phy in the device nodes for ohci, we can
> remove the support for older phys.
>
> Signed-off-by: Vivek Gautam <gautam.vi...@samsung.com>
> Cc: Jingoo Han <jg1....@samsung.com>
> Cc: Alan Stern <st...@rowland.harvard.edu>
> ---
> +static int exynos_ohci_phy_enable(struct device *dev)
> {
> struct usb_hcd *hcd = dev_get_drvdata(dev);
> struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd);
> + int i;
> + int ret = 0;
>
> - if (exynos_ohci->phy)
> - usb_phy_init(exynos_ohci->phy);
> + if (exynos_ohci->phy) {
> + ret = usb_phy_init(exynos_ohci->phy);
> + if (ret)
> + return ret;
> + }
> +
> + for (i = 0; ret == 0 && i < PHY_NUMBER; i++)
> + if (exynos_ohci->phy_g[i])
> + ret = phy_power_on(exynos_ohci->phy_g[i]);
> + if (ret)
> + for (i--; i >= 0; i--)
> + if (exynos_ohci->phy_g[i])
> + phy_power_off(exynos_ohci->phy_g[i]);
Do you want to call usb_phy_shutdown() at this point?
> +
> + return ret;
> }
>
> -static void exynos_ohci_phy_disable(struct device *dev)
> +static int exynos_ohci_phy_disable(struct device *dev)
> {
> struct usb_hcd *hcd = dev_get_drvdata(dev);
> struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd);
> + int i;
> + int ret = 0;
>
> if (exynos_ohci->phy)
> usb_phy_shutdown(exynos_ohci->phy);
> +
> + for (i = 0; i < PHY_NUMBER; i++)
> + if (exynos_ohci->phy_g[i])
> + ret = phy_power_off(exynos_ohci->phy_g[i]);
> +
> + return ret;
> }
This return value is practically meaningless. It is the status from
the last PHY only; any errors involving the other PHYs have been lost.
You may as well make this function return void.
> @@ -210,13 +302,18 @@ static int exynos_ohci_resume(struct device *dev)
> {
> struct usb_hcd *hcd = dev_get_drvdata(dev);
> struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd);
> + int ret;
>
> clk_prepare_enable(exynos_ohci->clk);
>
> if (exynos_ohci->otg)
> exynos_ohci->otg->set_host(exynos_ohci->otg, &hcd->self);
>
> - exynos_ohci_phy_enable(dev);
> + ret = exynos_ohci_phy_enable(dev);
> + if (ret) {
> + dev_err(dev, "Failed to enable USB phy\n");
Do you want to call clk_disable_unprepare() here?
> + return ret;
> + }
>
> ohci_resume(hcd, false);
Alan Stern
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
