[PATCH 1/5] usb: xhci-mtk: get optional clock by devm_clk_get

linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH 1/5] usb: xhci-mtk: get optional clock by devm_clk_get_optional()
@ 2019-03-30  9:28 Chunfeng Yun
  2019-03-30  9:28 ` [PATCH 2/5] usb: host: xhci-plat: " Chunfeng Yun
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Chunfeng Yun @ 2019-03-30  9:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Matthias Brugger, Chunfeng Yun, linux-usb, linux-kernel,
	linux-arm-kernel, linux-mediatek

Use devm_clk_get_optional() to get optional clock

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
 drivers/usb/host/xhci-mtk.c | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
index 60987c787e44..026fe18972d3 100644
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
@@ -206,19 +206,6 @@ static int xhci_mtk_ssusb_config(struct xhci_hcd_mtk *mtk)
 	return xhci_mtk_host_enable(mtk);
 }
 
-/* ignore the error if the clock does not exist */
-static struct clk *optional_clk_get(struct device *dev, const char *id)
-{
-	struct clk *opt_clk;
-
-	opt_clk = devm_clk_get(dev, id);
-	/* ignore error number except EPROBE_DEFER */
-	if (IS_ERR(opt_clk) && (PTR_ERR(opt_clk) != -EPROBE_DEFER))
-		opt_clk = NULL;
-
-	return opt_clk;
-}
-
 static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk)
 {
 	struct device *dev = mtk->dev;
@@ -229,15 +216,15 @@ static int xhci_mtk_clks_get(struct xhci_hcd_mtk *mtk)
 		return PTR_ERR(mtk->sys_clk);
 	}
 
-	mtk->ref_clk = optional_clk_get(dev, "ref_ck");
+	mtk->ref_clk = devm_clk_get_optional(dev, "ref_ck");
 	if (IS_ERR(mtk->ref_clk))
 		return PTR_ERR(mtk->ref_clk);
 
-	mtk->mcu_clk = optional_clk_get(dev, "mcu_ck");
+	mtk->mcu_clk = devm_clk_get_optional(dev, "mcu_ck");
 	if (IS_ERR(mtk->mcu_clk))
 		return PTR_ERR(mtk->mcu_clk);
 
-	mtk->dma_clk = optional_clk_get(dev, "dma_ck");
+	mtk->dma_clk = devm_clk_get_optional(dev, "dma_ck");
 	return PTR_ERR_OR_ZERO(mtk->dma_clk);
 }
 
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/5] usb: host: xhci-plat: get optional clock by devm_clk_get_optional()
  2019-03-30  9:28 [PATCH 1/5] usb: xhci-mtk: get optional clock by devm_clk_get_optional() Chunfeng Yun
@ 2019-03-30  9:28 ` Chunfeng Yun
  2019-03-30  9:28 ` [PATCH 3/5] usb: misc: usb3503: " Chunfeng Yun
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Chunfeng Yun @ 2019-03-30  9:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Matthias Brugger, Chunfeng Yun, linux-usb, linux-kernel,
	linux-arm-kernel, linux-mediatek, Mathias Nyman

Use devm_clk_get_optional() to get optional clock

Cc: Mathias Nyman <mathias.nyman@intel.com>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
 drivers/usb/host/xhci-plat.c | 39 +++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 0ac4ec975547..998241f5fce3 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -165,8 +165,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
 	struct xhci_hcd		*xhci;
 	struct resource         *res;
 	struct usb_hcd		*hcd;
-	struct clk              *clk;
-	struct clk              *reg_clk;
 	int			ret;
 	int			irq;
 
@@ -235,31 +233,32 @@ static int xhci_plat_probe(struct platform_device *pdev)
 	hcd->rsrc_start = res->start;
 	hcd->rsrc_len = resource_size(res);
 
+	xhci = hcd_to_xhci(hcd);
+
 	/*
 	 * Not all platforms have clks so it is not an error if the
 	 * clock do not exist.
 	 */
-	reg_clk = devm_clk_get(&pdev->dev, "reg");
-	if (!IS_ERR(reg_clk)) {
-		ret = clk_prepare_enable(reg_clk);
-		if (ret)
-			goto put_hcd;
-	} else if (PTR_ERR(reg_clk) == -EPROBE_DEFER) {
-		ret = -EPROBE_DEFER;
+	xhci->reg_clk = devm_clk_get_optional(&pdev->dev, "reg");
+	if (IS_ERR(xhci->reg_clk)) {
+		ret = PTR_ERR(xhci->reg_clk);
 		goto put_hcd;
 	}
 
-	clk = devm_clk_get(&pdev->dev, NULL);
-	if (!IS_ERR(clk)) {
-		ret = clk_prepare_enable(clk);
-		if (ret)
-			goto disable_reg_clk;
-	} else if (PTR_ERR(clk) == -EPROBE_DEFER) {
-		ret = -EPROBE_DEFER;
+	ret = clk_prepare_enable(xhci->reg_clk);
+	if (ret)
+		goto put_hcd;
+
+	xhci->clk = devm_clk_get_optional(&pdev->dev, NULL);
+	if (IS_ERR(xhci->clk)) {
+		ret = PTR_ERR(xhci->clk);
 		goto disable_reg_clk;
 	}
 
-	xhci = hcd_to_xhci(hcd);
+	ret = clk_prepare_enable(xhci->clk);
+	if (ret)
+		goto disable_reg_clk;
+
 	priv_match = of_device_get_match_data(&pdev->dev);
 	if (priv_match) {
 		struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
@@ -271,8 +270,6 @@ static int xhci_plat_probe(struct platform_device *pdev)
 
 	device_wakeup_enable(hcd->self.controller);
 
-	xhci->clk = clk;
-	xhci->reg_clk = reg_clk;
 	xhci->main_hcd = hcd;
 	xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
 			dev_name(&pdev->dev), hcd);
@@ -348,10 +345,10 @@ static int xhci_plat_probe(struct platform_device *pdev)
 	usb_put_hcd(xhci->shared_hcd);
 
 disable_clk:
-	clk_disable_unprepare(clk);
+	clk_disable_unprepare(xhci->clk);
 
 disable_reg_clk:
-	clk_disable_unprepare(reg_clk);
+	clk_disable_unprepare(xhci->reg_clk);
 
 put_hcd:
 	usb_put_hcd(hcd);
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/5] usb: misc: usb3503: get optional clock by devm_clk_get_optional()
  2019-03-30  9:28 [PATCH 1/5] usb: xhci-mtk: get optional clock by devm_clk_get_optional() Chunfeng Yun
  2019-03-30  9:28 ` [PATCH 2/5] usb: host: xhci-plat: " Chunfeng Yun
@ 2019-03-30  9:28 ` Chunfeng Yun
  2019-03-30  9:28 ` [PATCH 4/5] usb: dwc2: " Chunfeng Yun
  2019-03-30  9:28 ` [PATCH 5/5] usb: chipidea: msm: " Chunfeng Yun
  3 siblings, 0 replies; 7+ messages in thread
From: Chunfeng Yun @ 2019-03-30  9:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Matthias Brugger, Chunfeng Yun, linux-usb, linux-kernel,
	linux-arm-kernel, linux-mediatek, Dongjin Kim

Use devm_clk_get_optional() to get optional clock

Cc: Dongjin Kim <tobetter@gmail.com>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
 drivers/usb/misc/usb3503.c | 48 ++++++++++++++------------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/drivers/usb/misc/usb3503.c b/drivers/usb/misc/usb3503.c
index d5141aa79dd4..72f39a9751b5 100644
--- a/drivers/usb/misc/usb3503.c
+++ b/drivers/usb/misc/usb3503.c
@@ -172,7 +172,6 @@ static int usb3503_probe(struct usb3503 *hub)
 		hub->gpio_reset		= pdata->gpio_reset;
 		hub->mode		= pdata->initial_mode;
 	} else if (np) {
-		struct clk *clk;
 		u32 rate = 0;
 		hub->port_off_mask = 0;
 
@@ -198,34 +197,29 @@ static int usb3503_probe(struct usb3503 *hub)
 			}
 		}
 
-		clk = devm_clk_get(dev, "refclk");
-		if (IS_ERR(clk) && PTR_ERR(clk) != -ENOENT) {
+		hub->clk = devm_clk_get_optional(dev, "refclk");
+		if (IS_ERR(hub->clk)) {
 			dev_err(dev, "unable to request refclk (%ld)\n",
-					PTR_ERR(clk));
-			return PTR_ERR(clk);
+					PTR_ERR(hub->clk));
+			return PTR_ERR(hub->clk);
 		}
 
-		if (!IS_ERR(clk)) {
-			hub->clk = clk;
-
-			if (rate != 0) {
-				err = clk_set_rate(hub->clk, rate);
-				if (err) {
-					dev_err(dev,
-						"unable to set reference clock rate to %d\n",
-						(int) rate);
-					return err;
-				}
-			}
-
-			err = clk_prepare_enable(hub->clk);
+		if (rate != 0) {
+			err = clk_set_rate(hub->clk, rate);
 			if (err) {
 				dev_err(dev,
-					"unable to enable reference clock\n");
+					"unable to set reference clock rate to %d\n",
+					(int)rate);
 				return err;
 			}
 		}
 
+		err = clk_prepare_enable(hub->clk);
+		if (err) {
+			dev_err(dev, "unable to enable reference clock\n");
+			return err;
+		}
+
 		property = of_get_property(np, "disabled-ports", &len);
 		if (property && (len / sizeof(u32)) > 0) {
 			int i;
@@ -324,8 +318,7 @@ static int usb3503_i2c_remove(struct i2c_client *i2c)
 	struct usb3503 *hub;
 
 	hub = i2c_get_clientdata(i2c);
-	if (hub->clk)
-		clk_disable_unprepare(hub->clk);
+	clk_disable_unprepare(hub->clk);
 
 	return 0;
 }
@@ -348,8 +341,7 @@ static int usb3503_platform_remove(struct platform_device *pdev)
 	struct usb3503 *hub;
 
 	hub = platform_get_drvdata(pdev);
-	if (hub->clk)
-		clk_disable_unprepare(hub->clk);
+	clk_disable_unprepare(hub->clk);
 
 	return 0;
 }
@@ -358,18 +350,14 @@ static int usb3503_platform_remove(struct platform_device *pdev)
 static int usb3503_suspend(struct usb3503 *hub)
 {
 	usb3503_switch_mode(hub, USB3503_MODE_STANDBY);
-
-	if (hub->clk)
-		clk_disable_unprepare(hub->clk);
+	clk_disable_unprepare(hub->clk);
 
 	return 0;
 }
 
 static int usb3503_resume(struct usb3503 *hub)
 {
-	if (hub->clk)
-		clk_prepare_enable(hub->clk);
-
+	clk_prepare_enable(hub->clk);
 	usb3503_switch_mode(hub, hub->mode);
 
 	return 0;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 4/5] usb: dwc2: get optional clock by devm_clk_get_optional()
  2019-03-30  9:28 [PATCH 1/5] usb: xhci-mtk: get optional clock by devm_clk_get_optional() Chunfeng Yun
  2019-03-30  9:28 ` [PATCH 2/5] usb: host: xhci-plat: " Chunfeng Yun
  2019-03-30  9:28 ` [PATCH 3/5] usb: misc: usb3503: " Chunfeng Yun
@ 2019-03-30  9:28 ` Chunfeng Yun
  2019-04-01  8:47   ` Minas Harutyunyan
  2019-03-30  9:28 ` [PATCH 5/5] usb: chipidea: msm: " Chunfeng Yun
  3 siblings, 1 reply; 7+ messages in thread
From: Chunfeng Yun @ 2019-03-30  9:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Matthias Brugger, Chunfeng Yun, linux-usb, linux-kernel,
	linux-arm-kernel, linux-mediatek, Minas Harutyunyan

Use devm_clk_get_optional() to get optional clock

Cc: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
 drivers/usb/dwc2/platform.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
index c0b64d483552..9aa9682a5cd2 100644
--- a/drivers/usb/dwc2/platform.c
+++ b/drivers/usb/dwc2/platform.c
@@ -284,10 +284,10 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)
 	}
 
 	/* Clock */
-	hsotg->clk = devm_clk_get(hsotg->dev, "otg");
+	hsotg->clk = devm_clk_get_optional(hsotg->dev, "otg");
 	if (IS_ERR(hsotg->clk)) {
-		hsotg->clk = NULL;
-		dev_dbg(hsotg->dev, "cannot get otg clock\n");
+		dev_err(hsotg->dev, "cannot get otg clock\n");
+		return PTR_ERR(hsotg->clk);
 	}
 
 	/* Regulators */
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 4/5] usb: dwc2: get optional clock by devm_clk_get_optional()
  2019-03-30  9:28 ` [PATCH 4/5] usb: dwc2: " Chunfeng Yun
@ 2019-04-01  8:47   ` Minas Harutyunyan
  0 siblings, 0 replies; 7+ messages in thread
From: Minas Harutyunyan @ 2019-04-01  8:47 UTC (permalink / raw)
  To: Chunfeng Yun, Greg Kroah-Hartman
  Cc: Matthias Brugger, linux-usb, linux-kernel, linux-arm-kernel,
	linux-mediatek, Minas Harutyunyan

On 3/30/2019 1:28 PM, Chunfeng Yun wrote:
> Use devm_clk_get_optional() to get optional clock
> 
> Cc: Minas Harutyunyan <hminas@synopsys.com>
> Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>

Acked-by: Minas Harutyunyan <hminas@synopsys.com>

> ---
>   drivers/usb/dwc2/platform.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c
> index c0b64d483552..9aa9682a5cd2 100644
> --- a/drivers/usb/dwc2/platform.c
> +++ b/drivers/usb/dwc2/platform.c
> @@ -284,10 +284,10 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg)
>   	}
>   
>   	/* Clock */
> -	hsotg->clk = devm_clk_get(hsotg->dev, "otg");
> +	hsotg->clk = devm_clk_get_optional(hsotg->dev, "otg");
>   	if (IS_ERR(hsotg->clk)) {
> -		hsotg->clk = NULL;
> -		dev_dbg(hsotg->dev, "cannot get otg clock\n");
> +		dev_err(hsotg->dev, "cannot get otg clock\n");
> +		return PTR_ERR(hsotg->clk);
>   	}
>   
>   	/* Regulators */
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 5/5] usb: chipidea: msm: get optional clock by devm_clk_get_optional()
  2019-03-30  9:28 [PATCH 1/5] usb: xhci-mtk: get optional clock by devm_clk_get_optional() Chunfeng Yun
                   ` (2 preceding siblings ...)
  2019-03-30  9:28 ` [PATCH 4/5] usb: dwc2: " Chunfeng Yun
@ 2019-03-30  9:28 ` Chunfeng Yun
  2019-04-04  7:28   ` Peter Chen
  3 siblings, 1 reply; 7+ messages in thread
From: Chunfeng Yun @ 2019-03-30  9:28 UTC (permalink / raw)
  To: Greg Kroah-Hartman
  Cc: Matthias Brugger, Chunfeng Yun, linux-usb, linux-kernel,
	linux-arm-kernel, linux-mediatek, Peter Chen

Use devm_clk_get_optional() to get optional clock

Cc: Peter Chen <Peter.Chen@nxp.com>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
 drivers/usb/chipidea/ci_hdrc_msm.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index 880009987460..b8b3caad889c 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -205,12 +205,9 @@ static int ci_hdrc_msm_probe(struct platform_device *pdev)
 	if (IS_ERR(clk))
 		return PTR_ERR(clk);
 
-	ci->fs_clk = clk = devm_clk_get(&pdev->dev, "fs");
-	if (IS_ERR(clk)) {
-		if (PTR_ERR(clk) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
-		ci->fs_clk = NULL;
-	}
+	ci->fs_clk = clk = devm_clk_get_optional(&pdev->dev, "fs");
+	if (IS_ERR(clk))
+		return PTR_ERR(clk);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	ci->base = devm_ioremap_resource(&pdev->dev, res);
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* RE: [PATCH 5/5] usb: chipidea: msm: get optional clock by devm_clk_get_optional()
  2019-03-30  9:28 ` [PATCH 5/5] usb: chipidea: msm: " Chunfeng Yun
@ 2019-04-04  7:28   ` Peter Chen
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Chen @ 2019-04-04  7:28 UTC (permalink / raw)
  To: Chunfeng Yun, Greg Kroah-Hartman
  Cc: Matthias Brugger, linux-usb, linux-kernel, linux-arm-kernel,
	linux-mediatek

 
>  drivers/usb/chipidea/ci_hdrc_msm.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c
> b/drivers/usb/chipidea/ci_hdrc_msm.c
> index 880009987460..b8b3caad889c 100644
> --- a/drivers/usb/chipidea/ci_hdrc_msm.c
> +++ b/drivers/usb/chipidea/ci_hdrc_msm.c
> @@ -205,12 +205,9 @@ static int ci_hdrc_msm_probe(struct platform_device
> *pdev)
>  	if (IS_ERR(clk))
>  		return PTR_ERR(clk);
> 
> -	ci->fs_clk = clk = devm_clk_get(&pdev->dev, "fs");
> -	if (IS_ERR(clk)) {
> -		if (PTR_ERR(clk) == -EPROBE_DEFER)
> -			return -EPROBE_DEFER;
> -		ci->fs_clk = NULL;
> -	}
> +	ci->fs_clk = clk = devm_clk_get_optional(&pdev->dev, "fs");
> +	if (IS_ERR(clk))
> +		return PTR_ERR(clk);
> 
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>  	ci->base = devm_ioremap_resource(&pdev->dev, res);
> --
> 2.20.1

Acked-by: Peter Chen <peter.chen@nxp.com>

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-04-04  7:29 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-30  9:28 [PATCH 1/5] usb: xhci-mtk: get optional clock by devm_clk_get_optional() Chunfeng Yun
2019-03-30  9:28 ` [PATCH 2/5] usb: host: xhci-plat: " Chunfeng Yun
2019-03-30  9:28 ` [PATCH 3/5] usb: misc: usb3503: " Chunfeng Yun
2019-03-30  9:28 ` [PATCH 4/5] usb: dwc2: " Chunfeng Yun
2019-04-01  8:47   ` Minas Harutyunyan
2019-03-30  9:28 ` [PATCH 5/5] usb: chipidea: msm: " Chunfeng Yun
2019-04-04  7:28   ` Peter Chen

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).