From: Bjorn Helgaas <bhelgaas@google.com>
To: gxt@mprc.pku.edu.cn
Cc: linux-pci@vger.kernel.org, linux-arch@vger.kernel.org
Subject: Re: [PATCH v2 11/12] unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag
Date: Fri, 24 Feb 2012 15:20:14 -0700 [thread overview]
Message-ID: <CAErSpo6wf5y1E0XPPTPSbkqW4Jjsg3sdkDNbEG6S+=c2NBgL5g@mail.gmail.com> (raw)
In-Reply-To: <1330064364.12600.3.camel@epip-laptop>
On Thu, Feb 23, 2012 at 10:19 PM, Guan Xuetao <gxt@mprc.pku.edu.cn> wrote:
> On Thu, 2012-02-23 at 12:43 -0700, Bjorn Helgaas wrote:
>> CC: Guan Xuetao <gxt@mprc.pku.edu.cn>
>> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
>> ---
>> arch/unicore32/kernel/pci.c | 6 +++---
>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
>> index a8f07fe..6c1248f 100644
>> --- a/arch/unicore32/kernel/pci.c
>> +++ b/arch/unicore32/kernel/pci.c
>> @@ -19,9 +19,9 @@
>> #include <linux/slab.h>
>> #include <linux/init.h>
>> #include <linux/io.h>
>> +#include <asm-generic/pci-bridge.h>
> I recommend that asm-generic/pci-bridge.h should be inserted into
> asm/pci.h file.
Yes, you're right. I goofed on that. If/when I update the series,
I'll include that change.
I don't think anything will break the way it is, because the only user
of pci-bridge.h stuff is pci.c, but all the other arches include it in
asm/pci.h, so it makes sense to do it that way in unicore32 as well.
Bjorn
>>
>> static int debug_pci;
>> -static int use_firmware;
>>
>> #define CONFIG_CMD(bus, devfn, where) \
>> (0x80000000 | (bus->number << 16) | (devfn << 8) | (where & ~3))
>> @@ -276,7 +276,7 @@ static int __init pci_common_init(void)
>>
>> pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
>>
>> - if (!use_firmware) {
>> + if (!pci_has_flag(PCI_PROBE_ONLY)) {
>> /*
>> * Size the bridge windows.
>> */
>> @@ -303,7 +303,7 @@ char * __devinit pcibios_setup(char *str)
>> debug_pci = 1;
>> return NULL;
>> } else if (!strcmp(str, "firmware")) {
>> - use_firmware = 1;
>> + pci_add_flags(PCI_PROBE_ONLY);
>> return NULL;
>> }
>> return str;
>
>
next prev parent reply other threads:[~2012-02-24 22:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 19:43 [PATCH v2 00/12] generic pci_probe_only flag Bjorn Helgaas
2012-02-23 19:43 ` Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 01/12] PCI: make pci_flags always available Bjorn Helgaas
2012-02-23 19:43 ` Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 02/12] PCI: add pci_clear_flags() Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 03/12] alpha/PCI: replace pci_probe_only with pci_flags Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 04/12] arm/PCI: remove arch pci_flags definition Bjorn Helgaas
2012-02-23 19:43 ` Bjorn Helgaas
2012-02-23 21:39 ` Rob Herring
2012-02-23 21:39 ` Rob Herring
2012-02-23 19:43 ` [PATCH v2 05/12] arm/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag Bjorn Helgaas
2012-02-23 19:43 ` Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 06/12] microblaze/PCI: remove unused pci_flags Bjorn Helgaas
2012-02-23 19:43 ` Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 07/12] mips/PCI: replace pci_probe_only with pci_flags Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 08/12] mips/PCI: removed unused pci_probe configurability Bjorn Helgaas
2012-02-23 19:43 ` Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 09/12] powerpc/PCI: make pci_probe_only default to 0 Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 10/12] powerpc/PCI: replace pci_probe_only with pci_flags Bjorn Helgaas
2012-02-23 19:43 ` [PATCH v2 11/12] unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag Bjorn Helgaas
2012-02-23 19:43 ` Bjorn Helgaas
2012-02-24 6:19 ` Guan Xuetao
2012-02-24 22:20 ` Bjorn Helgaas [this message]
2012-02-23 19:44 ` [PATCH v2 12/12] PCI: make pci_flags non-weak 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='CAErSpo6wf5y1E0XPPTPSbkqW4Jjsg3sdkDNbEG6S+=c2NBgL5g@mail.gmail.com' \
--to=bhelgaas@google.com \
--cc=gxt@mprc.pku.edu.cn \
--cc=linux-arch@vger.kernel.org \
--cc=linux-pci@vger.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;
as well as URLs for NNTP newsgroup(s).