2023-07-26 11:55:06

by 李扬韬

Subject: [PATCH 03/30] usb: ohci-at91: Use devm_platform_get_and_ioremap_resource()

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 <[email protected]>
---
drivers/usb/host/ohci-at91.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index b9ce8d80f20b..f957d008f360 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -200,8 +200,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
return -ENOMEM;
ohci_at91 = hcd_to_ohci_at91_priv(hcd);

- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- hcd->regs = devm_ioremap_resource(dev, res);
+ hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(hcd->regs)) {
retval = PTR_ERR(hcd->regs);
goto err;
--
2.39.0

2023-07-26 15:21:32

by Alan Stern

Subject: Re: [PATCH 03/30] usb: ohci-at91: Use devm_platform_get_and_ioremap_resource()

On Wed, Jul 26, 2023 at 10:27:43AM -0400, Alan Stern wrote:
> On Wed, Jul 26, 2023 at 07:37:49PM +0800, 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 <[email protected]>
> > ---
> > drivers/usb/host/ohci-at91.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> > index b9ce8d80f20b..f957d008f360 100644
> > --- a/drivers/usb/host/ohci-at91.c
> > +++ b/drivers/usb/host/ohci-at91.c
> > @@ -200,8 +200,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
> > return -ENOMEM;
> > ohci_at91 = hcd_to_ohci_at91_priv(hcd);
> >
> > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > - hcd->regs = devm_ioremap_resource(dev, res);
> > + hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> > if (IS_ERR(hcd->regs)) {
> > retval = PTR_ERR(hcd->regs);
> > goto err;
>
> Did you try to test-compile this change (and all the similar ones in
> this series)? If you did, you would have gotten a warning about res
> being used without being initialized.

Oops! My apologies, I didn't read the code closely enough. Sorry.

For all the ehci, ohci, and uhci changes in this series:

Acked-by: Alan Stern <[email protected]>

Alan Stern

2023-07-26 15:36:24

by Alan Stern

Subject: Re: [PATCH 03/30] usb: ohci-at91: Use devm_platform_get_and_ioremap_resource()

On Wed, Jul 26, 2023 at 07:37:49PM +0800, 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 <[email protected]>
> ---
> drivers/usb/host/ohci-at91.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
> index b9ce8d80f20b..f957d008f360 100644
> --- a/drivers/usb/host/ohci-at91.c
> +++ b/drivers/usb/host/ohci-at91.c
> @@ -200,8 +200,7 @@ static int usb_hcd_at91_probe(const struct hc_driver *driver,
> return -ENOMEM;
> ohci_at91 = hcd_to_ohci_at91_priv(hcd);
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - hcd->regs = devm_ioremap_resource(dev, res);
> + hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> if (IS_ERR(hcd->regs)) {
> retval = PTR_ERR(hcd->regs);
> goto err;

Did you try to test-compile this change (and all the similar ones in
this series)? If you did, you would have gotten a warning about res
being used without being initialized.

Alan Stern