mirror of
https://github.com/torvalds/linux.git
synced 2026-05-30 10:04:04 +02:00
parisc/PCI: Clean up align handling
Caller of pcibios_align_resource() (__find_resource_space()) already aligns the start address by 'alignment' so aligning is only necessary if align > alignment. Change also to use ALIGN() instead of open-coding. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Link: https://patch.msgid.link/20260324165633.4583-8-ilpo.jarvinen@linux.intel.com
This commit is contained in:
parent
3fa40d305b
commit
38ec53e16f
|
|
@ -8,6 +8,7 @@
|
|||
* Copyright (C) 1999-2001 Hewlett-Packard Company
|
||||
* Copyright (C) 1999-2001 Grant Grundler
|
||||
*/
|
||||
#include <linux/align.h>
|
||||
#include <linux/eisa.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/module.h>
|
||||
|
|
@ -200,7 +201,7 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
|
|||
resource_size_t size,
|
||||
resource_size_t alignment)
|
||||
{
|
||||
resource_size_t mask, align, start = res->start;
|
||||
resource_size_t align, start = res->start;
|
||||
|
||||
DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n",
|
||||
pci_name(((struct pci_dev *) data)),
|
||||
|
|
@ -209,11 +210,8 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
|
|||
|
||||
/* If it's not IO, then it's gotta be MEM */
|
||||
align = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;
|
||||
|
||||
/* Align to largest of MIN or input size */
|
||||
mask = max(alignment, align) - 1;
|
||||
start += mask;
|
||||
start &= ~mask;
|
||||
if (align > alignment)
|
||||
start = ALIGN(start, align);
|
||||
|
||||
return start;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user