Messages in this thread | | | Subject | Re: [PATCH v3 01/10] ata: pata_platform: Make use of platform_get_mem_or_io() | From | Sergey Shtylyov <> | Date | Fri, 24 Dec 2021 20:56:38 +0300 |
| |
On 12/24/21 4:12 PM, Lad Prabhakar wrote:
> Make use of platform_get_mem_or_io() to simplify the code. > > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> > --- > 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))
You don't have to keep unlikely() here -- the first *if* doesn't have it anyway, only the 2nd one does...
> + 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))
Ditto.
> + return -EINVAL;
MBR, Sergey
| |