Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH 09/11] PCI: Add is_pci_iov_resource_idx() | Date | Tue, 22 May 2012 23:34:35 -0700 |
| |
So we can remove one ifdef in setup-bus.c. and will share the code in that ifdef block.
Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- drivers/pci/setup-bus.c | 7 +++---- include/linux/pci.h | 8 ++++++++ 2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 4d6823f..99bc728 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -813,16 +813,15 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, if (r->parent || (r->flags & mask) != type) continue; r_size = resource_size(r); -#ifdef CONFIG_PCI_IOV + /* put SRIOV requested res to the optional list */ - if (realloc_head && i >= PCI_IOV_RESOURCES && - i <= PCI_IOV_RESOURCE_END) { + if (realloc_head && is_pci_iov_resource_idx(i)) { r->end = r->start - 1; add_to_list(realloc_head, dev, r, r_size, 0/* dont' care */); children_add_size += r_size; continue; } -#endif + /* For bridges size != alignment */ align = pci_resource_alignment(dev, r); order = __ffs(align) - 20; diff --git a/include/linux/pci.h b/include/linux/pci.h index c0704a0..0d254d9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -114,6 +114,14 @@ enum { DEVICE_COUNT_RESOURCE = PCI_NUM_RESOURCES, }; +static inline bool is_pci_iov_resource_idx(int i) +{ +#ifdef CONFIG_PCI_IOV + return i >= PCI_IOV_RESOURCES && i <= PCI_IOV_RESOURCE_END; +#endif + return false; +} + typedef int __bitwise pci_power_t; #define PCI_D0 ((pci_power_t __force) 0) -- 1.7.7
| |