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 X-Patchwork-Id: 123453 Delivered-To: patch@linaro.org Received: by 10.140.42.230 with SMTP id c93csp26079qga; Thu, 4 Jan 2018 13:12:28 -0800 (PST) X-Google-Smtp-Source: ACJfBotm453or/I/YPp8wh+L+C36+aFPh7BPp+FZbo/XCFYe61l4hEcGd41As1A6oYwRHcv3xweR X-Received: by 10.84.240.195 with SMTP id l3mr782740plt.378.1515100348763; Thu, 04 Jan 2018 13:12:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515100348; cv=none; d=google.com; s=arc-20160816; b=Z/uDE48TsXFCL1RXvTmNF07th4D+Ec9yICdD/dd0JdDNPsS5r4Ant7S9pCarvKEVmV OkChJlfuS6XIDeEh0YlvtnVaV3NkjrqJSKtg4b8bAhNg65ae0ra0nlDcsBnNIaNBwn02 d/xFcNOhbnaKgakivuP7sLKC/wfxLRo/tv7ssK+VpJGC/M7RoGbaXkbuTWPgpod2Mv+Y 5q5FgOAKHIyHQDHWQZZ4PCjfBMyal8FHLmtPSaHpXz3jSeQxac97EeKghKeANJBhpR3Q mkVkdyY8jMh2H1bWG4gMICf7RBjQ+OyIVHP9pB5GkDEkl0Okp7GjSi7kddKLrsxIr7I7 qzPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=5iCT7w56fBvDoLS4InGgs85fmuN9oR7bb5Y+kpsSaO8=; b=zRRG4J6rB0TEfpm4lQUTvry7lBCiq5dD1+NYa9YePSdar5+dT6ROxHZmH2V4BC+nGE UmVzBi5JqyXvvkKrwsfPeZw315bP5n8nFiWICYwb6wrV37OqJj9ni2ufSis+deydP27g er6PYgaVBS5VUwsRu3GTNskx8JuyQPz52UThz/ulzfytGJjDxRT8bl6UECuvoGPh7hLR iyN8AYcZTB53Osn9f3oqc3fq+VIEdGgWz4JhtGOmPCMO/vJaZ/6WyEtvQe1Lkf1D77sM xnVKTJcmGYJLtpiGYJSkbtzTV2WB0gxhNvhEESdNXTDFGXH+mI93nKVreSJrRB2YNG9O ghhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b3si2820892plb.293.2018.01.04.13.12.28; Thu, 04 Jan 2018 13:12:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753348AbeADVMY (ORCPT + 10 others); Thu, 4 Jan 2018 16:12:24 -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-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.14.1 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) {