diff options
| author | Zefan Li <lizefan@huawei.com> | 2015-06-16 10:12:13 +0800 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-06-16 10:12:13 +0800 |
| commit | 2269a92ca93ad6419bff6bc1df81cf99738bf1f4 (patch) | |
| tree | 7479fd7392734656a636945d96960d30b6826830 | |
| parent | 86e15864ea2f0d5f6ef55a4348ffb8910ba6d6d3 (diff) | |
| download | linux-3.4.y-queue-2269a92ca93ad6419bff6bc1df81cf99738bf1f4.tar.gz | |
Fix pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch
| -rw-r--r-- | patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch | 63 |
1 files changed, 48 insertions, 15 deletions
diff --git a/patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch b/patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch index 7045084..a5d852f 100644 --- a/patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch +++ b/patches/pci-convert-pcibios_resource_to_bus-to-take-a-pci_bus-not-a-pci_dev.patch @@ -32,21 +32,23 @@ Cc: Dirk Behme <dirk.behme@gmail.com> - adjust context] Signed-off-by: Zefan Li <lizefan@huawei.com> --- - arch/alpha/kernel/pci-sysfs.c | 4 ++-- - arch/powerpc/kernel/pci_of_scan.c | 4 ++-- - arch/sparc/kernel/pci.c | 12 ++++++------ - drivers/pci/probe.c | 32 +++++++++++++++----------------- - drivers/pci/rom.c | 2 +- - drivers/pci/setup-bus.c | 14 +++++++------- - drivers/pci/setup-res.c | 2 +- - drivers/pcmcia/i82092.c | 2 +- - drivers/pcmcia/yenta_socket.c | 6 +++--- - drivers/scsi/sym53c8xx_2/sym_glue.c | 5 +++-- - drivers/video/arkfb.c | 2 +- - drivers/video/s3fb.c | 2 +- - drivers/video/vt8623fb.c | 2 +- - include/linux/pci.h | 4 ++-- - 14 files changed, 46 insertions(+), 47 deletions(-) + arch/alpha/kernel/pci-sysfs.c | 4 +-- + arch/powerpc/kernel/pci_of_scan.c | 4 +-- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +-- + arch/sparc/kernel/pci.c | 12 +++++------ + drivers/pci/probe.c | 32 ++++++++++++++---------------- + drivers/pci/quirks.c | 2 - + drivers/pci/rom.c | 2 - + drivers/pci/setup-bus.c | 14 ++++++------- + drivers/pci/setup-res.c | 2 - + drivers/pcmcia/i82092.c | 2 - + drivers/pcmcia/yenta_socket.c | 6 ++--- + drivers/scsi/sym53c8xx_2/sym_glue.c | 5 ++-- + drivers/video/arkfb.c | 2 - + drivers/video/s3fb.c | 2 - + drivers/video/vt8623fb.c | 2 - + include/linux/pci.h | 4 +-- + 16 files changed, 49 insertions(+), 50 deletions(-) --- a/arch/alpha/kernel/pci-sysfs.c +++ b/arch/alpha/kernel/pci-sysfs.c @@ -460,3 +462,34 @@ Signed-off-by: Zefan Li <lizefan@huawei.com> struct pci_bus_region *region); void pcibios_scan_specific_bus(int busn); extern struct pci_bus *pci_find_bus(int domain, int busnr); +--- a/arch/powerpc/platforms/powernv/pci-ioda.c ++++ b/arch/powerpc/platforms/powernv/pci-ioda.c +@@ -392,7 +392,7 @@ static void __devinit pnv_ioda_setup_pe_ + + /* Setup IO segments */ + if (io_res.start < io_res.end) { +- pcibios_resource_to_bus(dev, ®ion, &io_res); ++ pcibios_resource_to_bus(dev->bus, ®ion, &io_res); + pos = region.start; + i = pos / phb->ioda.io_segsize; + while(i < phb->ioda.total_pe && pos <= region.end) { +@@ -422,7 +422,7 @@ static void __devinit pnv_ioda_setup_pe_ + + /* Setup M32 segments */ + if (m32_res.start < m32_res.end) { +- pcibios_resource_to_bus(dev, ®ion, &m32_res); ++ pcibios_resource_to_bus(dev->bus, ®ion, &m32_res); + pos = region.start; + i = pos / phb->ioda.m32_segsize; + while(i < phb->ioda.total_pe && pos <= region.end) { +--- a/drivers/pci/quirks.c ++++ b/drivers/pci/quirks.c +@@ -393,7 +393,7 @@ static void __devinit quirk_io_region(st + /* Convert from PCI bus to resource space. */ + bus_region.start = res->start; + bus_region.end = res->end; +- pcibios_bus_to_resource(dev, res, &bus_region); ++ pcibios_bus_to_resource(dev->bus, res, &bus_region); + + if (pci_claim_resource(dev, nr) == 0) + dev_info(&dev->dev, "quirk: %pR claimed by %s\n", |