| Message ID | 20200508144024.7836-1-tangbin@cmss.chinamobile.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 15518726d60a39c7a517fff1a374dab403637a2a |
| Headers | show |
| Series | [v2] USB: host: ehci-mxc: Use the defined variable to simplify code | expand |
On Fri, 8 May 2020, Tang Bin wrote: > Use the defined variable "dev" to make the code cleaner. And > delete an extra blank line. > > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> > Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> > --- > Changes from v1: > - fix the subject and the code. > --- Acked-by: Alan Stern <stern@rowland.harvard.edu> > drivers/usb/host/ehci-mxc.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c > index c9f91e6c7..09e01397f 100644 > --- a/drivers/usb/host/ehci-mxc.c > +++ b/drivers/usb/host/ehci-mxc.c > @@ -36,12 +36,12 @@ static const struct ehci_driver_overrides ehci_mxc_overrides __initconst = { > > static int ehci_mxc_drv_probe(struct platform_device *pdev) > { > - struct mxc_usbh_platform_data *pdata = dev_get_platdata(&pdev->dev); > + struct device *dev = &pdev->dev; > + struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev); > struct usb_hcd *hcd; > struct resource *res; > int irq, ret; > struct ehci_mxc_priv *priv; > - struct device *dev = &pdev->dev; > struct ehci_hcd *ehci; > > if (!pdata) { > @@ -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); >
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index c9f91e6c7..09e01397f 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -36,12 +36,12 @@ static const struct ehci_driver_overrides ehci_mxc_overrides __initconst = { static int ehci_mxc_drv_probe(struct platform_device *pdev) { - struct mxc_usbh_platform_data *pdata = dev_get_platdata(&pdev->dev); + struct device *dev = &pdev->dev; + struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev); struct usb_hcd *hcd; struct resource *res; int irq, ret; struct ehci_mxc_priv *priv; - struct device *dev = &pdev->dev; struct ehci_hcd *ehci; if (!pdata) { @@ -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);