From patchwork Thu Jun 4 21:50:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6550201 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E3F8AC0020 for ; Thu, 4 Jun 2015 21:50:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 576F520737 for ; Thu, 4 Jun 2015 21:50:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5499C205F0 for ; Thu, 4 Jun 2015 21:50:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753762AbbFDVuJ (ORCPT ); Thu, 4 Jun 2015 17:50:09 -0400 Received: from mail-ob0-f178.google.com ([209.85.214.178]:35606 "EHLO mail-ob0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752773AbbFDVuI (ORCPT ); Thu, 4 Jun 2015 17:50:08 -0400 Received: by obbgp2 with SMTP id gp2so19790004obb.2 for ; Thu, 04 Jun 2015 14:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:date:message-id:in-reply-to:references:user-agent :mime-version:content-type:content-transfer-encoding; bh=rcOyHx4m93H5y2VzUfcH//7vzyNDM4zCD1vY8+0nlVs=; b=kiAUJ43Nj2yoTDeE/Cy7tJ9njfdy9n8YV5OXze95kgySs3fGl9bBno0vBfRbf9qf3W zycel8tXCLHEnw9/imbeLnmnWMdbBYaXsGeuCz3Y0HyKIKysiCoNF2QAPtDu+pGchc0a Wv6BpCyW0ABlxUpNS7vsAg47sdie6aPlSFL3nfWqCqxqp9Aa34leTuju2DAL7YXwWTfh oPxjuyx0BWkQu+Wtoqe7AIChl9CcZ+B+AWzcBIr/SnsUZfsLbynZ3gSw4fUFz5K98Efh OKoBP3/HpO06+k+axL3I0F66Lw2lqDDstSKvh6QDOjNMhkHGwQJHajWkxq1TIQE9ysku u94Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=rcOyHx4m93H5y2VzUfcH//7vzyNDM4zCD1vY8+0nlVs=; b=NmU/w122IZOk2LrCxPVjQTmxGYyADb8mhPPbam9NAZE8NmY5gOh14n3mb6xxhzkjB1 xzbHtiKVmNGFLlAWvBxLZZjUmLSXkrsE64Rc3rPFq0L/RJznc3EoaMFbyao31oe/C6mu 0+MXRCiUczAxY/MRCO4Ll4e8nl4jbpQrorU8T8lqYmUpf6DKLlXBN6emz1M9rMl/OMHx 9QAmzamcphOxmuQ6ZRAnBotPnmyW02uhb0q0rQxfsc15f62eS28Zkh0oZzazl8lXnehx aBHShwyXPnywiAkdtPUeD1dIkwbNXld8qvDFGafGQHYFYSaKEFjew2UEasHHu07qEycV AErg== X-Gm-Message-State: ALoCoQnDJ6svFAlTln6Zu7c+Y43sCYDYUVY21RHYLxej9jB3ZVoJraiSyeqyTO4sQIoCctDoEyPo X-Received: by 10.202.76.68 with SMTP id z65mr122631oia.54.1433454607414; Thu, 04 Jun 2015 14:50:07 -0700 (PDT) Received: from localhost (172-9-203-140.lightspeed.spfdmo.sbcglobal.net. [172.9.203.140]) by mx.google.com with ESMTPSA id l5sm2183176oey.5.2015.06.04.14.50.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Jun 2015 14:50:06 -0700 (PDT) Subject: [PATCH 6/7] PCI: Remove unused pcibios_select_root() (again) To: linux-pci@vger.kernel.org From: Bjorn Helgaas Date: Thu, 04 Jun 2015 16:50:05 -0500 Message-ID: <20150604215005.2399.4144.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150604214614.2399.5142.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150604214614.2399.5142.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP a6c140969b46 ("Delete pcibios_select_root") removed pcibios_select_root(). But a7db50405216 ("PCI: remove pcibios_scan_all_fns()") added a few copies back, probably with some incorrect merge conflict resolutions. Remove the still-unused pcibios_select_root() definitions. Signed-off-by: Bjorn Helgaas --- arch/ia64/include/asm/pci.h | 13 ------------- arch/microblaze/include/asm/pci.h | 13 ------------- arch/mn10300/include/asm/pci.h | 13 ------------- include/asm-generic/pci.h | 13 ------------- 4 files changed, 52 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 52af5ed..32ea19a 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h @@ -108,19 +108,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) return (pci_domain_nr(bus) != 0); } -static inline struct resource * -pcibios_select_root(struct pci_dev *pdev, struct resource *res) -{ - struct resource *root = NULL; - - if (res->flags & IORESOURCE_IO) - root = &ioport_resource; - if (res->flags & IORESOURCE_MEM) - root = &iomem_resource; - - return root; -} - #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) { diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 67224d3..e910a29 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -81,19 +81,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, */ #define PCI_DMA_BUS_IS_PHYS (1) -static inline struct resource *pcibios_select_root(struct pci_dev *pdev, - struct resource *res) -{ - struct resource *root = NULL; - - if (res->flags & IORESOURCE_IO) - root = &ioport_resource; - if (res->flags & IORESOURCE_MEM) - root = &iomem_resource; - - return root; -} - extern void pcibios_claim_one_bus(struct pci_bus *b); extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 5f70af2..c222d17 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h @@ -83,19 +83,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, /* implement the pci_ DMA API in terms of the generic device dma_ one */ #include -static inline struct resource * -pcibios_select_root(struct pci_dev *pdev, struct resource *res) -{ - struct resource *root = NULL; - - if (res->flags & IORESOURCE_IO) - root = &ioport_resource; - if (res->flags & IORESOURCE_MEM) - root = &iomem_resource; - - return root; -} - static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) { return channel ? 15 : 14; diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h index e80a049..f24bc51 100644 --- a/include/asm-generic/pci.h +++ b/include/asm-generic/pci.h @@ -6,19 +6,6 @@ #ifndef _ASM_GENERIC_PCI_H #define _ASM_GENERIC_PCI_H -static inline struct resource * -pcibios_select_root(struct pci_dev *pdev, struct resource *res) -{ - struct resource *root = NULL; - - if (res->flags & IORESOURCE_IO) - root = &ioport_resource; - if (res->flags & IORESOURCE_MEM) - root = &iomem_resource; - - return root; -} - #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) {