mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
resource: replace open coded resource_overlaps()
In iomem_map_sanity_check() a piece of code resembles the content of the resource_overlaps(). Replace open coded piece with the call to the existing helper. Link: https://lore.kernel.org/20260915085353.3518153-1-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Bradley Morgan <brads@mainlining.org> Cc: Bjorn Helgaas <helgaas@kernel.org>
This commit is contained in:
parent
4effccfd50
commit
6838e20f66
|
|
@ -1833,7 +1833,7 @@ __setup("reserve=", reserve_setup);
|
|||
*/
|
||||
int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
|
||||
{
|
||||
resource_size_t end = addr + size - 1;
|
||||
struct resource mem = DEFINE_RES_MEM(addr, size);
|
||||
struct resource *p;
|
||||
int err = 0;
|
||||
|
||||
|
|
@ -1843,12 +1843,10 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
|
|||
* We can probably skip the resources without
|
||||
* IORESOURCE_IO attribute?
|
||||
*/
|
||||
if (p->start > end)
|
||||
if (!resource_overlaps(p, &mem))
|
||||
continue;
|
||||
if (p->end < addr)
|
||||
continue;
|
||||
if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
|
||||
PFN_DOWN(p->end) >= PFN_DOWN(end))
|
||||
if (PFN_DOWN(p->start) <= PFN_DOWN(mem.start) &&
|
||||
PFN_DOWN(p->end) >= PFN_DOWN(mem.end))
|
||||
continue;
|
||||
/*
|
||||
* if a resource is "BUSY", it's not a hardware resource
|
||||
|
|
@ -1859,8 +1857,8 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
|
|||
if (p->flags & IORESOURCE_BUSY)
|
||||
continue;
|
||||
|
||||
pr_debug("resource sanity check: requesting [mem %pa-%pa], which spans more than %s %pR\n",
|
||||
&addr, &end, p->name, p);
|
||||
pr_debug("resource sanity check: requesting %pR, which spans more than %s %pR\n",
|
||||
&mem, p->name, p);
|
||||
err = -1;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user