2022-01-17 11:08:13

by Prabhakar Mahadev Lad

Subject: [PATCH] ata: pata_platform: Make use of platform_get_mem_or_io()

Make use of platform_get_mem_or_io() to simplify the code.

While at it, drop use of unlikely() from pata_platform_probe()
as it isn't a hotpath.

Signed-off-by: Lad Prabhakar <[email protected]>
Reviewed-by: Sergey Shtylyov <[email protected]>
---
Hi All,

This patch is part of series [1]. Just sending this lone patch
for now.

[1] http://patchwork.ozlabs.org/project/linux-ide/list/?series=278349

Cheers,
Prabhakar
---
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..29902001e223 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 (!io_res)
+ 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 (!ctl_res)
+ return -EINVAL;

/*
* And the IRQ
--
2.17.1

2022-01-28 22:25:13

by Damien Le Moal

Subject: Re: [PATCH] ata: pata_platform: Make use of platform_get_mem_or_io()

On 1/17/22 11:01, Lad Prabhakar wrote:
> Make use of platform_get_mem_or_io() to simplify the code.
>
> While at it, drop use of unlikely() from pata_platform_probe()
> as it isn't a hotpath.
>
> Signed-off-by: Lad Prabhakar <[email protected]>
> Reviewed-by: Sergey Shtylyov <[email protected]>
> ---
> Hi All,
>
> This patch is part of series [1]. Just sending this lone patch
> for now.
>
> [1] http://patchwork.ozlabs.org/project/linux-ide/list/?series=278349
>
> Cheers,
> Prabhakar

Applied to for-5.18. Thanks !


--
Damien Le Moal
Western Digital Research