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: 855824 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zCLKh3hWRz9s7n for ; Fri, 5 Jan 2018 08:19:52 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zCLKh2kz3zDqr6 for ; Fri, 5 Jan 2018 08:19:52 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=74.125.82.194; helo=mail-ot0-f194.google.com; envelope-from=robherring2@gmail.com; receiver=) Received: from mail-ot0-f194.google.com (mail-ot0-f194.google.com [74.125.82.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zCL932n8gzDqp0 for ; Fri, 5 Jan 2018 08:12:23 +1100 (AEDT) Received: by mail-ot0-f194.google.com with SMTP id q5so2411715oth.2 for ; Thu, 04 Jan 2018 13:12:23 -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=f2o1WDKpM0e3tEyCx70g2e3BaUBNS9BXITnr4AOOOfT0AuoJVljeKMBr24HcMbtolK 17yrnZza3sFr67eEpBp+kq9IqPCmGIvJu2AR+s7QT6TO+gdbNsiO6pFp5svol9yvQmPM ZwuWhUS7xywkiLanJe6dup01iSpYBtANZtdf8/AWKprWmGjCvKKj5pW7BHbeLW5rdeh5 QVdWFOjmwub9qqFREbNkFvqMsjjeazVlAHpmT2x4AXngXUaRTjf5io9IUalZIMkfpAKs wba8ilp/fEJdqTredbTA2lumpMGM71tbkx+jDVPaoJ9moFWWx/4RFA7oCPtKK4+zjOJN J62Q== X-Gm-Message-State: AKwxytek4/bRW969BXrbQxfF89xGbaCDvdHd5YrS+84/bVhqXjSOZ3x9 1kUQsNQdtvPHBp1vFAJt/g== 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 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> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Mackerras , Frank Rowand Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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) {