Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419AbbGNWsU (ORCPT ); Tue, 14 Jul 2015 18:48:20 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:45104 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753046AbbGNWsQ (ORCPT ); Tue, 14 Jul 2015 18:48:16 -0400 From: Yinghai Lu To: Bjorn Helgaas , David Miller , Benjamin Herrenschmidt , Wei Yang , TJ , Yijing Wang Cc: Andrew Morton , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v2 30/49] PCI: Kill macro checking for bus io port sizing Date: Tue, 14 Jul 2015 15:47:01 -0700 Message-Id: <1436914040-13206-31-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1436914040-13206-1-git-send-email-yinghai@kernel.org> References: <1436914040-13206-1-git-send-email-yinghai@kernel.org> X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1724 Lines: 55 Use new generic version skip_isa_ioresource_align() instead. Signed-off-by: Yinghai Lu --- drivers/pci/setup-bus.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 9478e91..f3bb309 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1172,15 +1172,12 @@ int skip_isa_ioresource_align(struct pci_bus *bus) return 0; } -static resource_size_t size_aligned_for_isa(resource_size_t size) +static resource_size_t size_aligned_for_isa(resource_size_t size, + struct pci_bus *bus) { - /* - * To be fixed in 2.5: we should have sort of HAVE_ISA - * flag in the struct pci_bus. - */ -#if defined(CONFIG_ISA) || defined(CONFIG_EISA) - size = (size & 0xff) + ((size & ~0xffUL) << 2); -#endif + if (!skip_isa_ioresource_align(bus)) + size = (size & 0xff) + ((size & ~0xffUL) << 2); + return size; } @@ -1249,12 +1246,12 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, } } - size = size_aligned_for_isa(size); + size = size_aligned_for_isa(size, bus); size += size1; if (size || min_size) size0 = calculate_size(size, min_size, resource_size(b_res), min_align); - sum_add_size = size_aligned_for_isa(sum_add_size); + sum_add_size = size_aligned_for_isa(sum_add_size, bus); sum_add_size += sum_add_size1; if (sum_add_size < min_sum_size) sum_add_size = min_sum_size; -- 1.8.4.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/