mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Liviu Dudau <Liviu.Dudau@arm.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Arnd Bergmann <arnd@arndb.de>, Rob Herring <robh+dt@kernel.org>,
	Jason Gunthorpe <jgunthorpe@obsidianresearch.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <Will.Deacon@arm.com>,
	Russell King <linux@arm.linux.org.uk>,
	linux-pci <linux-pci@vger.kernel.org>,
	Linus Walleij <linus.walleij@linaro.org>
Cc: Tanmay Inamdar <tinamdar@apm.com>,
	Grant Likely <grant.likely@secretlab.ca>,
	Sinan Kaya <okaya@codeaurora.org>,
	Jingoo Han <jg1.han@samsung.com>,
	Kukjin Kim <kgene.kim@samsung.com>,
	Suravee Suthikulanit <suravee.suthikulpanit@amd.com>,
	linux-arch <linux-arch@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Device Tree ML <devicetree@vger.kernel.org>,
	LAKML <linux-arm-kernel@lists.infradead.org>,
	Yinghai Lu <yinghai@kernel.org>,
	Jiang Liu <jiang.liu@linux.intel.com>
Subject: [PATCH v13 04/12] of/pci: Define of_pci_range_to_resource() only when CONFIG_PCI=y
Date: Mon, 29 Sep 2014 15:29:23 +0100	[thread overview]
Message-ID: <1412000971-9242-5-git-send-email-Liviu.Dudau@arm.com> (raw)
In-Reply-To: <1412000971-9242-1-git-send-email-Liviu.Dudau@arm.com>

From: Bjorn Helgaas <bhelgaas@google.com>

of_pci_range_to_resource() was previously defined always, but it's only
used by PCI code, so move the definition inside the CONFIG_OF_ADDRESS &&
CONFIG_PCI block.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 include/linux/of_address.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index f8cc7da..ecf913c 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -23,17 +23,6 @@ struct of_pci_range {
 #define for_each_of_pci_range(parser, range) \
 	for (; of_pci_range_parser_one(parser, range);)
 
-static inline void of_pci_range_to_resource(struct of_pci_range *range,
-					    struct device_node *np,
-					    struct resource *res)
-{
-	res->flags = range->flags;
-	res->start = range->cpu_addr;
-	res->end = range->cpu_addr + range->size - 1;
-	res->parent = res->child = res->sibling = NULL;
-	res->name = np->full_name;
-}
-
 /* Translate a DMA address from device space to CPU space */
 extern u64 of_translate_dma_address(struct device_node *dev,
 				    const __be32 *in_addr);
@@ -140,6 +129,18 @@ extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,
 			       u64 *size, unsigned int *flags);
 extern int of_pci_address_to_resource(struct device_node *dev, int bar,
 				      struct resource *r);
+
+static inline void of_pci_range_to_resource(struct of_pci_range *range,
+					    struct device_node *np,
+					    struct resource *res)
+{
+	res->flags = range->flags;
+	res->start = range->cpu_addr;
+	res->end = range->cpu_addr + range->size - 1;
+	res->parent = res->child = res->sibling = NULL;
+	res->name = np->full_name;
+}
+
 #else /* CONFIG_OF_ADDRESS && CONFIG_PCI */
 static inline int of_pci_address_to_resource(struct device_node *dev, int bar,
 				             struct resource *r)
@@ -155,4 +156,3 @@ static inline const __be32 *of_get_pci_address(struct device_node *dev,
 #endif /* CONFIG_OF_ADDRESS && CONFIG_PCI */
 
 #endif /* __OF_ADDRESS_H */
-
-- 
2.1.1


  parent reply	other threads:[~2014-09-29 14:31 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-29 14:29 [PATCH v13 00/12] Support for creating generic PCI host bridges from DT Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 01/12] asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 02/12] of/pci: Add pci_register_io_range() and pci_pio_to_address() Liviu Dudau
2014-09-29 19:20   ` Al Stone
2014-09-30  8:59     ` Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 03/12] ARM: Define PCI_IOBASE as the base of virtual PCI IO space Liviu Dudau
2014-09-29 14:29 ` Liviu Dudau [this message]
2014-09-29 14:29 ` [PATCH v13 05/12] of/pci: Move of_pci_range_to_resources() to of/address.c Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 06/12] of/pci: Fix the conversion of IO ranges into IO resources Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 07/12] PCI: Add generic domain handling Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 08/12] of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr() Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 09/12] of/pci: Add support for parsing PCI host bridge resources from DT Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 10/12] PCI: Assign unassigned bus resources in pci_scan_root_bus() Liviu Dudau
2014-09-29 18:25   ` Yinghai Lu
2014-09-29 19:06     ` Yinghai Lu
2014-09-29 21:02       ` Benjamin Herrenschmidt
2014-09-29 21:33         ` Bjorn Helgaas
2014-09-29 22:31           ` Benjamin Herrenschmidt
2014-09-29 23:08             ` Bjorn Helgaas
2014-09-30  8:54               ` Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 11/12] PCI: Add pci_remap_iospace() to map bus I/O resources Liviu Dudau
2014-09-29 14:29 ` [PATCH v13 12/12] arm64: Add architectural support for PCI Liviu Dudau
2014-09-29 19:43 ` [PATCH v13 00/12] Support for creating generic PCI host bridges from DT Bjorn Helgaas
2014-09-30 10:39   ` Liviu Dudau
2014-09-30 16:18     ` Bjorn Helgaas
2014-09-30 16:45       ` Liviu Dudau
2014-09-30 16:54       ` Liviu Dudau
2014-10-08  7:44         ` Robert Richter
2014-10-08  9:13           ` Liviu Dudau
2014-10-08 10:36             ` Robert Richter
2014-10-08 11:46               ` Liviu Dudau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412000971-9242-5-git-send-email-Liviu.Dudau@arm.com \
    --to=liviu.dudau@arm.com \
    --cc=Will.Deacon@arm.com \
    --cc=arnd@arndb.de \
    --cc=benh@kernel.crashing.org \
    --cc=bhelgaas@google.com \
    --cc=catalin.marinas@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@secretlab.ca \
    --cc=jg1.han@samsung.com \
    --cc=jgunthorpe@obsidianresearch.com \
    --cc=jiang.liu@linux.intel.com \
    --cc=kgene.kim@samsung.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=okaya@codeaurora.org \
    --cc=robh+dt@kernel.org \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=tinamdar@apm.com \
    --cc=yinghai@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®