Re: [PATCH v2 1/4] ata: pata_platform: make use of platform_get_mem_or_io()

From: Lad, Prabhakar
Date: Thu Dec 23 2021 - 06:25:38 EST


Hi Damien,

Thank you for the review.

On Thu, Dec 23, 2021 at 12:35 AM Damien Le Moal
<damien.lemoal@xxxxxxxxxxxxxxxxxx> wrote:
>
> On 12/22/21 01:26, Lad Prabhakar wrote:
> > Make use of platform_get_mem_or_io() to simplify the code.
> >
> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx>
> > ---
> > v1-->v2
> > * No change
> > ---
> > drivers/ata/pata_platform.c | 18 ++++++------------
> > 1 file changed, 6 insertions(+), 12 deletions(-)
> >
> > diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
> > index 028329428b75..cb3134bf88eb 100644
> > --- a/drivers/ata/pata_platform.c
> > +++ b/drivers/ata/pata_platform.c
> > @@ -198,22 +198,16 @@ static int pata_platform_probe(struct platform_device *pdev)
> > /*
> > * Get the I/O base first
> > */
> > - io_res = platform_get_resource(pdev, IORESOURCE_IO, 0);
> > - if (io_res == NULL) {
> > - io_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > - if (unlikely(io_res == NULL))
> > - return -EINVAL;
> > - }
> > + io_res = platform_get_mem_or_io(pdev, 0);
> > + if (unlikely(!io_res))
>
> This is not the hot path, so I do not think that the unlikely() is
> necessary here.
>
Ok will drop the unlikely() and just check for NULL instead.

> > + return -EINVAL;
> >
> > /*
> > * Then the CTL base
> > */
> > - ctl_res = platform_get_resource(pdev, IORESOURCE_IO, 1);
> > - if (ctl_res == NULL) {
> > - ctl_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> > - if (unlikely(ctl_res == NULL))
> > - return -EINVAL;
> > - }
> > + ctl_res = platform_get_mem_or_io(pdev, 1);
> > + if (unlikely(!ctl_res))
>
> Same comment here.
>
ditto.

Cheers,
Prabhakar

> > + return -EINVAL;
> >
> > /*
> > * And the IRQ
>
>
> --
> Damien Le Moal
> Western Digital Research