| Message ID | 20230726113816.888-28-frank.li@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 23396172f20a926e6c4c16e43e3499d9ba17cf45 |
| Headers | show |
| Series | [01/30] usb: ehci-npcm7xx: fix typo in npcm7xx_ehci_hcd_drv_probe() | expand |
On 7/26/23 13:38, Yangtao Li wrote: > Convert platform_get_resource(), devm_ioremap_resource() to a single > call to devm_platform_get_and_ioremap_resource(), as this is exactly > what this function does. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > drivers/usb/host/ehci-st.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c > index ee0976b815b4..2dbb0d86daaa 100644 > --- a/drivers/usb/host/ehci-st.c > +++ b/drivers/usb/host/ehci-st.c > @@ -158,11 +158,6 @@ static int st_ehci_platform_probe(struct platform_device *dev) > irq = platform_get_irq(dev, 0); > if (irq < 0) > return irq; > - res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0); > - if (!res_mem) { > - dev_err(&dev->dev, "no memory resource provided"); > - return -ENXIO; > - } > > hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev, > dev_name(&dev->dev)); > @@ -222,14 +217,13 @@ static int st_ehci_platform_probe(struct platform_device *dev) > goto err_put_clks; > } > > - hcd->rsrc_start = res_mem->start; > - hcd->rsrc_len = resource_size(res_mem); > - > - hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); > + hcd->regs = devm_platform_get_and_ioremap_resource(dev, 0, &res_mem); > if (IS_ERR(hcd->regs)) { > err = PTR_ERR(hcd->regs); > goto err_put_clks; > } > + hcd->rsrc_start = res_mem->start; > + hcd->rsrc_len = resource_size(res_mem); > > err = usb_add_hcd(hcd, irq, IRQF_SHARED); > if (err) Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Thanks Patrice
diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c index ee0976b815b4..2dbb0d86daaa 100644 --- a/drivers/usb/host/ehci-st.c +++ b/drivers/usb/host/ehci-st.c @@ -158,11 +158,6 @@ static int st_ehci_platform_probe(struct platform_device *dev) irq = platform_get_irq(dev, 0); if (irq < 0) return irq; - res_mem = platform_get_resource(dev, IORESOURCE_MEM, 0); - if (!res_mem) { - dev_err(&dev->dev, "no memory resource provided"); - return -ENXIO; - } hcd = usb_create_hcd(&ehci_platform_hc_driver, &dev->dev, dev_name(&dev->dev)); @@ -222,14 +217,13 @@ static int st_ehci_platform_probe(struct platform_device *dev) goto err_put_clks; } - hcd->rsrc_start = res_mem->start; - hcd->rsrc_len = resource_size(res_mem); - - hcd->regs = devm_ioremap_resource(&dev->dev, res_mem); + hcd->regs = devm_platform_get_and_ioremap_resource(dev, 0, &res_mem); if (IS_ERR(hcd->regs)) { err = PTR_ERR(hcd->regs); goto err_put_clks; } + hcd->rsrc_start = res_mem->start; + hcd->rsrc_len = resource_size(res_mem); err = usb_add_hcd(hcd, irq, IRQF_SHARED); if (err)
Convert platform_get_resource(), devm_ioremap_resource() to a single call to devm_platform_get_and_ioremap_resource(), as this is exactly what this function does. Signed-off-by: Yangtao Li <frank.li@vivo.com> --- drivers/usb/host/ehci-st.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)