2020-05-08 11:52:30

by Tang Bin

Subject: [PATCH] USB: host: ehci: Use the defined variable to simplify code

Use the defined variable "dev" to make the code cleaner. And
delete an extra blank line.

Signed-off-by: Zhang Shengju <[email protected]>
Signed-off-by: Tang Bin <[email protected]>
---
drivers/usb/host/ehci-mxc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index c9f91e6c7..a1eb5ee77 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -56,7 +56,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
return -ENOMEM;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- hcd->regs = devm_ioremap_resource(&pdev->dev, res);
+ hcd->regs = devm_ioremap_resource(dev, res);
if (IS_ERR(hcd->regs)) {
ret = PTR_ERR(hcd->regs);
goto err_alloc;
@@ -69,14 +69,14 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
priv = (struct ehci_mxc_priv *) ehci->priv;

/* enable clocks */
- priv->usbclk = devm_clk_get(&pdev->dev, "ipg");
+ priv->usbclk = devm_clk_get(dev, "ipg");
if (IS_ERR(priv->usbclk)) {
ret = PTR_ERR(priv->usbclk);
goto err_alloc;
}
clk_prepare_enable(priv->usbclk);

- priv->ahbclk = devm_clk_get(&pdev->dev, "ahb");
+ priv->ahbclk = devm_clk_get(dev, "ahb");
if (IS_ERR(priv->ahbclk)) {
ret = PTR_ERR(priv->ahbclk);
goto err_clk_ahb;
@@ -84,13 +84,12 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
clk_prepare_enable(priv->ahbclk);

/* "dr" device has its own clock on i.MX51 */
- priv->phyclk = devm_clk_get(&pdev->dev, "phy");
+ priv->phyclk = devm_clk_get(dev, "phy");
if (IS_ERR(priv->phyclk))
priv->phyclk = NULL;
if (priv->phyclk)
clk_prepare_enable(priv->phyclk);

-
/* call platform specific init function */
if (pdata->init) {
ret = pdata->init(pdev);
--
2.20.1.windows.1

2020-05-08 14:00:43

by Alan Stern

Subject: Re: [PATCH] USB: host: ehci: Use the defined variable to simplify code

On Fri, 8 May 2020, Tang Bin wrote:

> Use the defined variable "dev" to make the code cleaner. And
> delete an extra blank line.

Again, the Subject: line should say "ehci-mxc".

> Signed-off-by: Zhang Shengju <[email protected]>
> Signed-off-by: Tang Bin <[email protected]>
> ---
> drivers/usb/host/ehci-mxc.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
> index c9f91e6c7..a1eb5ee77 100644
> --- a/drivers/usb/host/ehci-mxc.c
> +++ b/drivers/usb/host/ehci-mxc.c
> @@ -56,7 +56,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - hcd->regs = devm_ioremap_resource(&pdev->dev, res);
> + hcd->regs = devm_ioremap_resource(dev, res);

As long as you're making these changes, why not also move the
definition of dev up before the definition of pdata? Then you could
change the definition of pdata to:

struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev);

Alan Stern

> if (IS_ERR(hcd->regs)) {
> ret = PTR_ERR(hcd->regs);
> goto err_alloc;
> @@ -69,14 +69,14 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
> priv = (struct ehci_mxc_priv *) ehci->priv;
>
> /* enable clocks */
> - priv->usbclk = devm_clk_get(&pdev->dev, "ipg");
> + priv->usbclk = devm_clk_get(dev, "ipg");
> if (IS_ERR(priv->usbclk)) {
> ret = PTR_ERR(priv->usbclk);
> goto err_alloc;
> }
> clk_prepare_enable(priv->usbclk);
>
> - priv->ahbclk = devm_clk_get(&pdev->dev, "ahb");
> + priv->ahbclk = devm_clk_get(dev, "ahb");
> if (IS_ERR(priv->ahbclk)) {
> ret = PTR_ERR(priv->ahbclk);
> goto err_clk_ahb;
> @@ -84,13 +84,12 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
> clk_prepare_enable(priv->ahbclk);
>
> /* "dr" device has its own clock on i.MX51 */
> - priv->phyclk = devm_clk_get(&pdev->dev, "phy");
> + priv->phyclk = devm_clk_get(dev, "phy");
> if (IS_ERR(priv->phyclk))
> priv->phyclk = NULL;
> if (priv->phyclk)
> clk_prepare_enable(priv->phyclk);
>
> -
> /* call platform specific init function */
> if (pdata->init) {
> ret = pdata->init(pdev);
>

2020-05-08 14:30:04

by Tang Bin

Subject: Re: [PATCH] USB: host: ehci: Use the defined variable to simplifycode

On 2020/5/8 21:56, Alan Stern wrote:
> On Fri, 8 May 2020, Tang Bin wrote:
>
>> Use the defined variable "dev" to make the code cleaner. And
>> delete an extra blank line.
> Again, the Subject: line should say "ehci-mxc".
Got it.
>
>> Signed-off-by: Zhang Shengju <[email protected]>
>> Signed-off-by: Tang Bin <[email protected]>
>> ---
>> drivers/usb/host/ehci-mxc.c | 9 ++++-----
>> 1 file changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
>> index c9f91e6c7..a1eb5ee77 100644
>> --- a/drivers/usb/host/ehci-mxc.c
>> +++ b/drivers/usb/host/ehci-mxc.c
>> @@ -56,7 +56,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
>> return -ENOMEM;
>>
>> res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> - hcd->regs = devm_ioremap_resource(&pdev->dev, res);
>> + hcd->regs = devm_ioremap_resource(dev, res);
> As long as you're making these changes, why not also move the
> definition of dev up before the definition of pdata? Then you could
> change the definition of pdata to:
>
> struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev);
>
Got it.

Thanks