From patchwork Thu Jan 4 21:12:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 10145635 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4A0EC6034B for ; Thu, 4 Jan 2018 21:16:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30E40204FD for ; Thu, 4 Jan 2018 21:16:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F7622624C; Thu, 4 Jan 2018 21:16:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A518E28A7F for ; Thu, 4 Jan 2018 21:12:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753287AbeADVMX (ORCPT ); Thu, 4 Jan 2018 16:12:23 -0500 Received: from mail-ot0-f195.google.com ([74.125.82.195]:39374 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752617AbeADVMV (ORCPT ); Thu, 4 Jan 2018 16:12:21 -0500 Received: by mail-ot0-f195.google.com with SMTP id 37so2399588otv.6; Thu, 04 Jan 2018 13:12:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5iCT7w56fBvDoLS4InGgs85fmuN9oR7bb5Y+kpsSaO8=; b=XcaYr/SydYrjvw77LTm0t3oE7QbLs0Fr5459u5apjfnlSNSadHDMfJeT6ypYRNFyhU wOU2Yc7zUxkfVapvWAxPz6/gh2/VFfE10QIV9vC16tDcGWjomPZKG3vTxn1NJvriklG+ Ayjvhwxy5PNphBnAaVmiXysl3WGREw5zAkBrVLlJiw80xSBCWGbKaLtN29NFJvI6WNOx Fw5n9d8+7F+9QWealCfzskj6mHPEpJEOjyiaReNtlIOUQTFtj3lPP+PzCOyzgr8/r3ra n4wR86k+USvaReIPJqLOAlvep2AJI8nQrfHRqXZNHMYCU4YBwkSp/jvSijWvV9/3osG8 7btw== X-Gm-Message-State: AKwxyteOKCYNzsF89JbF6xtA6FUcyu08Sc2en+f4r5QSfPPXkDRkiANh XIiZaLkuRSUPWevOs0y2rQ== X-Google-Smtp-Source: ACJfBotWd8yBHH1xi3vBGOGVHvSFGhYGbIkmx0kS5QiIktz5/uwXe5VXsxtA23hMTWF74ar/tqvbyA== X-Received: by 10.157.81.21 with SMTP id c21mr583633oth.249.1515100341207; Thu, 04 Jan 2018 13:12:21 -0800 (PST) Received: from xps15.usacommunications.tv (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id s11sm1988147ots.46.2018.01.04.13.12.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jan 2018 13:12:20 -0800 (PST) From: Rob Herring To: Bjorn Helgaas Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Frank Rowand , linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org Subject: [PATCH 3/3] PCI: make of_irq_parse_pci static Date: Thu, 4 Jan 2018 15:12:15 -0600 Message-Id: <20180104211215.11344-4-robh@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180104211215.11344-1-robh@kernel.org> References: <20180104211215.11344-1-robh@kernel.org> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that the DT PCI code is merged into drivers/pci, of_irq_parse_pci can be static. Cc: Bjorn Helgaas Cc: Frank Rowand Cc: linux-pci@vger.kernel.org Signed-off-by: Rob Herring --- drivers/pci/of.c | 3 +-- include/linux/of_pci.h | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 859a43dd098d..511a5ec83f6e 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -479,7 +479,7 @@ int of_pci_map_rid(struct device_node *np, u32 rid, * PCI tree until an device-node is found, at which point it will finish * resolving using the OF tree walking. */ -int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) +static int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) { struct device_node *dn, *ppnode; struct pci_dev *ppdev; @@ -569,7 +569,6 @@ int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq } return rc; } -EXPORT_SYMBOL_GPL(of_irq_parse_pci); /** * of_irq_parse_and_map_pci() - Decode a PCI irq from the device tree and map to a virq diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index f0e129e848ea..88865e0ebf4d 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -10,7 +10,6 @@ struct of_phandle_args; struct device_node; #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_PCI) -int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq); struct device_node *of_pci_find_child_device(struct device_node *parent, unsigned int devfn); int of_pci_get_devfn(struct device_node *np); @@ -23,11 +22,6 @@ int of_pci_map_rid(struct device_node *np, u32 rid, const char *map_name, const char *map_mask_name, struct device_node **target, u32 *id_out); #else -static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) -{ - return 0; -} - static inline struct device_node *of_pci_find_child_device(struct device_node *parent, unsigned int devfn) {