Merge branch 'parisc-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[firefly-linux-kernel-4.4.55.git] / drivers / parisc / lba_pci.c

diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index dceb9ddfd99af6d754b0190fe2eb99431f64f4a6..7b9e89ba0465f120b07385643b56900a61054696 100644 (file)
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -693,7 +693,6 @@ lba_fixup_bus(struct pci_bus *bus)
        if (bus->parent) {
                int i;
                /* PCI-PCI Bridge */
-               pci_read_bridge_bases(bus);
                for (i = PCI_BRIDGE_RESOURCES; i < PCI_NUM_RESOURCES; i++)
                        pci_claim_bridge_resource(bus->self, i);
        } else {
@@ -1556,8 +1555,11 @@ lba_driver_probe(struct parisc_device *dev)
        if (lba_dev->hba.lmmio_space.flags)
                pci_add_resource_offset(&resources, &lba_dev->hba.lmmio_space,
                                        lba_dev->hba.lmmio_space_offset);
-       if (lba_dev->hba.gmmio_space.flags)
-               pci_add_resource(&resources, &lba_dev->hba.gmmio_space);
+       if (lba_dev->hba.gmmio_space.flags) {
+               /* pci_add_resource(&resources, &lba_dev->hba.gmmio_space); */
+               pr_warn("LBA: Not registering GMMIO space %pR\n",
+                       &lba_dev->hba.gmmio_space);
+       }
 
        pci_add_resource(&resources, &lba_dev->hba.bus_num);