From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition
Date: Thu, 23 Feb 2012 15:39:08 -0600 [thread overview]
Message-ID: <4F46B1FC.4050002@gmail.com> (raw)
In-Reply-To: <20120223194322.20708.4942.stgit@bhelgaas.mtv.corp.google.com>
Bjorn,
On 02/23/2012 01:43 PM, Bjorn Helgaas wrote:
> The PCI core provides a pci_flags definition (currently __weak), so drop
> the arm definition in favor of that.
>
> We EXPORT_SYMBOL(pci_flags) as arm did previously. I'm dubious about
> this: no other architecture exports it, and I didn't see any modules in
> the tree that reference it.
I think you're right that it doesn't need to be exported.
Rob
> CC: Rob Herring <rob.herring@calxeda.com>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: linux-arm-kernel at lists.infradead.org
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> arch/arm/kernel/bios32.c | 2 ++
> arch/arm/mm/iomap.c | 3 ---
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> index f58ba35..f3fd52b 100644
> --- a/arch/arm/kernel/bios32.c
> +++ b/arch/arm/kernel/bios32.c
> @@ -525,6 +525,7 @@ void __init pci_common_init(struct hw_pci *hw)
>
> INIT_LIST_HEAD(&hw->buses);
>
> + pci_add_flags(PCI_REASSIGN_ALL_RSRC);
> if (hw->preinit)
> hw->preinit();
> pcibios_init_hw(hw);
> @@ -559,6 +560,7 @@ void __init pci_common_init(struct hw_pci *hw)
> pci_bus_add_devices(bus);
> }
> }
> +EXPORT_SYMBOL(pci_flags);
>
> #ifndef CONFIG_PCI_HOST_ITE8152
> void pcibios_set_master(struct pci_dev *dev)
> diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c
> index e62956e..4614208 100644
> --- a/arch/arm/mm/iomap.c
> +++ b/arch/arm/mm/iomap.c
> @@ -32,9 +32,6 @@ EXPORT_SYMBOL(pcibios_min_io);
> unsigned long pcibios_min_mem = 0x01000000;
> EXPORT_SYMBOL(pcibios_min_mem);
>
> -unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC;
> -EXPORT_SYMBOL(pci_flags);
> -
> void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
> {
> if ((unsigned long)addr >= VMALLOC_START &&
>
next prev parent reply other threads:[~2012-02-23 21:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120223194209.20708.54480.stgit@bhelgaas.mtv.corp.google.com>
2012-02-23 19:43 ` [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition Bjorn Helgaas
2012-02-23 21:39 ` Rob Herring [this message]
2012-02-23 19:43 ` [PATCH v2 05/12] arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag Bjorn Helgaas
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=4F46B1FC.4050002@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).