diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-08-31 15:16:23 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2024-04-29 16:45:53 +0200 |
| commit | d39d1677c304d773d88db37c8ade4a3ace697c14 (patch) | |
| tree | f8a541739390c4b2893b8d72b77a3768256d22e4 /drivers/zorro | |
| parent | 70d830e337f999ad186d0093e973805eaf6fb8ca (diff) | |
| download | linux-stable-d39d1677c304d773d88db37c8ade4a3ace697c14.tar.gz linux-stable-d39d1677c304d773d88db37c8ade4a3ace697c14.tar.bz2 linux-stable-d39d1677c304d773d88db37c8ade4a3ace697c14.zip | |
zorro: Use helpers from ioport.h
We can use the DEFINE_RES_MEM_NAMED() macro and resource_contains()
helper instead of reimplementing them in the code. No functional change
intended.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20230831121623.36293-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/zorro.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 1b9928648583..2196474ce6ef 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c @@ -117,17 +117,13 @@ static struct resource __init *zorro_find_parent_resource( int i; for (i = 0; i < bridge->num_resources; i++) { - struct resource *r = &bridge->resource[i]; - - if (zorro_resource_start(z) >= r->start && - zorro_resource_end(z) <= r->end) - return r; + if (resource_contains(&bridge->resource[i], &z->resource)) + return &bridge->resource[i]; } + return &iomem_resource; } - - static int __init amiga_zorro_probe(struct platform_device *pdev) { struct zorro_bus *bus; @@ -176,9 +172,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) z->slotsize = zi->slotsize; sprintf(z->name, "Zorro device %08x", z->id); zorro_name_device(z); - z->resource.start = zi->boardaddr; - z->resource.end = zi->boardaddr + zi->boardsize - 1; - z->resource.name = z->name; + z->resource = DEFINE_RES_MEM_NAMED(zi->boardaddr, zi->boardsize, z->name); r = zorro_find_parent_resource(pdev, z); error = request_resource(r, &z->resource); if (error && !(z->rom.er_Type & ERTF_MEMLIST)) |