From patchwork Wed Oct 16 20:06:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11194267 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E43D414DB for ; Wed, 16 Oct 2019 20:07:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3C6620663 for ; Wed, 16 Oct 2019 20:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571256457; bh=xAMSDHJRu+klrBiWNLGGlkSoErpq59QmcEO+qE7uTrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CYYYu2TFWHWvHhgLvL67bgzK1BsKgFwxrL0ZVUMB7WnFfVdkf71XQI2wwKIvOWgEM h3mgPIXhUYJWM5+KVblApDhFVUp9TBJ8EJn9GKETwLBGcleVp8G/ocEkiWM9sFFSFJ tK0ozbI+6PKgLlHPdp4Q6Xw6JVfJ2Dc20NvUxWYA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387866AbfJPUHh (ORCPT ); Wed, 16 Oct 2019 16:07:37 -0400 Received: from mail-oi1-f193.google.com ([209.85.167.193]:39126 "EHLO mail-oi1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387601AbfJPUHh (ORCPT ); Wed, 16 Oct 2019 16:07:37 -0400 Received: by mail-oi1-f193.google.com with SMTP id w144so120276oia.6; Wed, 16 Oct 2019 13:07:36 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=5gD14iI8UpOKj376Bq/txSzTZsSs0VToSMrptEdmjdQ=; b=DNfD7zRHAZOyZZHQ8E0bB6KN2HvAyk2YKDYXFVniSFSOj6RKjy5xwPZlTIe+riXm4U cq84xRRk3lYmbF7n1SjRHGPwPjDG8VTSsoXXeqV+ZW9+bpBn1UonGFZDnVkqpR31UyVm FVl5baEWBKiArhlyNq6+geDmtbCSrQHCv8kzrgZdaFTOEKlynk2Ko7xnOik5w4PW7O2m 8y4A6lKUsisaGxFQYt07v2Q6yPlvAY7VyeN13pdk6HatX+RpWwH9l6+qoOaCULNSp2nk cZ2+Js8QRwsbdpwGGUgKCrVGAWLEFE2kmFf0EiIPKcc9bLOLNzBkXIQnYrDFuL+BcxFw 3fsg== X-Gm-Message-State: APjAAAUTi1wUkNhcbH/rOUZvOH0Eo2VxvYaMlqa1+rKkL5z83PZIEdbI 7yQEIYcy+EZ6y8siORch4w== X-Google-Smtp-Source: APXvYqwARWAGB+loxletdL6FrwiWyw5aEFkfQ6bbkwqrIvNHj0wJXVi7rbTCOJSVySk78uO9yqn8Ag== X-Received: by 2002:aca:df41:: with SMTP id w62mr110576oig.90.1571256456105; Wed, 16 Oct 2019 13:07:36 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id a9sm7412463oie.7.2019.10.16.13.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2019 13:07:35 -0700 (PDT) From: Rob Herring To: Andrew Murray , Bjorn Helgaas , Lorenzo Pieralisi Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, Gustavo Pimentel , Heiko Stuebner , Hou Zhiqiang , Jingoo Han , Karthikeyan Mitran , Ley Foon Tan , Linus Walleij , linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, Matthias Brugger , Michal Simek , Ray Jui , rfi@lists.rocketboards.org, Ryder Lee , Scott Branden , Shawn Lin , Simon Horman , Srinath Mannam , Thomas Petazzoni , Toan Le , Tom Joseph , Will Deacon Subject: [PATCH v2 25/25] PCI: Make devm_of_pci_get_host_bridge_resources() static Date: Wed, 16 Oct 2019 15:06:47 -0500 Message-Id: <20191016200647.32050-26-robh@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191016200647.32050-1-robh@kernel.org> References: <20191016200647.32050-1-robh@kernel.org> MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Now that all the PCI host drivers are using pci_parse_request_of_pci_ranges(), make devm_of_pci_get_host_bridge_resources() static. Cc: Bjorn Helgaas Signed-off-by: Rob Herring --- drivers/pci/of.c | 5 +---- drivers/pci/pci.h | 17 ----------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/pci/of.c b/drivers/pci/of.c index 0b1e4623dfcf..00e4b9fcb41d 100644 --- a/drivers/pci/of.c +++ b/drivers/pci/of.c @@ -236,7 +236,6 @@ void of_pci_check_probe_only(void) } EXPORT_SYMBOL_GPL(of_pci_check_probe_only); -#if defined(CONFIG_OF_ADDRESS) /** * devm_of_pci_get_host_bridge_resources() - Resource-managed parsing of PCI * host bridge resources from DT @@ -255,7 +254,7 @@ EXPORT_SYMBOL_GPL(of_pci_check_probe_only); * It returns zero if the range parsing has been successful or a standard error * value if it failed. */ -int devm_of_pci_get_host_bridge_resources(struct device *dev, +static int devm_of_pci_get_host_bridge_resources(struct device *dev, unsigned char busno, unsigned char bus_max, struct list_head *resources, struct list_head *ib_resources, @@ -384,8 +383,6 @@ int devm_of_pci_get_host_bridge_resources(struct device *dev, pci_free_resource_list(resources); return err; } -EXPORT_SYMBOL_GPL(devm_of_pci_get_host_bridge_resources); -#endif /* CONFIG_OF_ADDRESS */ #if IS_ENABLED(CONFIG_OF_IRQ) /** diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 6692c4fe4290..118a4974537b 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -630,23 +630,6 @@ static inline void pci_set_bus_of_node(struct pci_bus *bus) { } static inline void pci_release_bus_of_node(struct pci_bus *bus) { } #endif /* CONFIG_OF */ -#if defined(CONFIG_OF_ADDRESS) -int devm_of_pci_get_host_bridge_resources(struct device *dev, - unsigned char busno, unsigned char bus_max, - struct list_head *resources, - struct list_head *ib_resources, - resource_size_t *io_base); -#else -static inline int devm_of_pci_get_host_bridge_resources(struct device *dev, - unsigned char busno, unsigned char bus_max, - struct list_head *resources, - struct list_head *ib_resources, - resource_size_t *io_base) -{ - return -EINVAL; -} -#endif - #ifdef CONFIG_PCIEAER void pci_no_aer(void); void pci_aer_init(struct pci_dev *dev);