Re: [PATCH v2 11/12] unicore32/PCI: use pci_flags PCI_PROBE_ONLY instead of arm-specific flag

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Feb 23, 2012 at 10:19 PM, Guan Xuetao <gxt@xxxxxxxxxxxxxxx> wrote:
> On Thu, 2012-02-23 at 12:43 -0700, Bjorn Helgaas wrote:
>> CC: Guan Xuetao <gxt@xxxxxxxxxxxxxxx>
>> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>> ---
>>  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;
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [DMA Engine]     [Linux Coverity]     [Linux USB]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Greybus]

  Powered by Linux