Merge branches 'pci/irq', 'pci/misc', 'pci/resource' and 'pci/virtualization' into...

[firefly-linux-kernel-4.4.55.git] / arch / mn10300 / unit-asb2305 / pci-asb2305.c

diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c
index b5b036f64275b0fe0176132b74f4715f185f7503..b7ab8378964ce5e9ca55acdd869d249f18a3d49b 100644 (file)
--- a/arch/mn10300/unit-asb2305/pci-asb2305.c
+++ b/arch/mn10300/unit-asb2305/pci-asb2305.c
@@ -183,18 +183,16 @@ static int __init pcibios_assign_resources(void)
        struct pci_dev *dev = NULL;
        struct resource *r;
 
-       if (!(pci_probe & PCI_ASSIGN_ROMS)) {
-               /* Try to use BIOS settings for ROMs, otherwise let
-                  pci_assign_unassigned_resources() allocate the new
-                  addresses. */
-               for_each_pci_dev(dev) {
-                       r = &dev->resource[PCI_ROM_RESOURCE];
-                       if (!r->flags || !r->start)
-                               continue;
-                       if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
-                               r->end -= r->start;
-                               r->start = 0;
-                       }
+       /* Try to use BIOS settings for ROMs, otherwise let
+          pci_assign_unassigned_resources() allocate the new
+          addresses. */
+       for_each_pci_dev(dev) {
+               r = &dev->resource[PCI_ROM_RESOURCE];
+               if (!r->flags || !r->start)
+                       continue;
+               if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
+                       r->end -= r->start;
+                       r->start = 0;
                }
        }