diff mbox series

[30/30] usb: ohci-st: Use devm_platform_get_and_ioremap_resource()

Message ID 20230726113816.888-30-frank.li@vivo.com
State New
Headers show
Series [01/30] usb: ehci-npcm7xx: fix typo in npcm7xx_ehci_hcd_drv_probe() | expand

Commit Message

李扬韬 July 26, 2023, 11:38 a.m. UTC
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/ohci-st.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

Comments

Patrice CHOTARD Aug. 28, 2023, 9:08 a.m. UTC | #1
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/ohci-st.c | 14 ++++----------
>  1 file changed, 4 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
> index 884e447a8098..214342013f7e 100644
> --- a/drivers/usb/host/ohci-st.c
> +++ b/drivers/usb/host/ohci-st.c
> @@ -139,12 +139,6 @@ static int st_ohci_platform_probe(struct platform_device *dev)
>  	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(&ohci_platform_hc_driver, &dev->dev,
>  			dev_name(&dev->dev));
>  	if (!hcd)
> @@ -199,14 +193,14 @@ static int st_ohci_platform_probe(struct platform_device *dev)
>  			goto err_power;
>  	}
>  
> -	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_power;
>  	}
> +	hcd->rsrc_start = res_mem->start;
> +	hcd->rsrc_len = resource_size(res_mem);
> +
>  	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
>  	if (err)
>  		goto err_power;
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>

Thanks
Patrice
diff mbox series

Patch

diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c
index 884e447a8098..214342013f7e 100644
--- a/drivers/usb/host/ohci-st.c
+++ b/drivers/usb/host/ohci-st.c
@@ -139,12 +139,6 @@  static int st_ohci_platform_probe(struct platform_device *dev)
 	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(&ohci_platform_hc_driver, &dev->dev,
 			dev_name(&dev->dev));
 	if (!hcd)
@@ -199,14 +193,14 @@  static int st_ohci_platform_probe(struct platform_device *dev)
 			goto err_power;
 	}
 
-	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_power;
 	}
+	hcd->rsrc_start = res_mem->start;
+	hcd->rsrc_len = resource_size(res_mem);
+
 	err = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (err)
 		goto err_power;