diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index b40733dd253c..521acd632f1a 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -261,7 +261,6 @@ struct brcm_pcie {
 	u32			hw_rev;
 	void			(*perst_set)(struct brcm_pcie *pcie, u32 val);
 	void			(*bridge_sw_init_set)(struct brcm_pcie *pcie, u32 val);
-	bool			regulator_oops;
 	struct subdev_regulators *sr;
 	bool			ep_wakeup_capable;
 };
@@ -685,8 +684,8 @@ static bool brcm_pcie_link_up(struct brcm_pcie *pcie)
 	return dla && plu;
 }
 
-static void __iomem *brcm_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
-					int where)
+static void __iomem *brcm_pcie_map_bus(struct pci_bus *bus,
+				       unsigned int devfn, int where)
 {
 	struct brcm_pcie *pcie = bus->sysdata;
 	void __iomem *base = pcie->base;
@@ -694,7 +693,7 @@ static void __iomem *brcm_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
 
 	/* Accesses to the RC go right to the RC registers if !devfn */
 	if (pci_is_root_bus(bus))
-		return devfn ? NULL : base + (where & 0xfff);
+		return devfn ? NULL : base + PCIE_ECAM_REG(where);
 
 	/* An access to our HW w/o link-up will cause a CPU Abort */
 	if (!brcm_pcie_link_up(pcie))
@@ -703,11 +702,11 @@ static void __iomem *brcm_pcie_map_bus(struct pci_bus *bus, unsigned int devfn,
 	/* For devices, write to the config space index register */
 	idx = PCIE_ECAM_OFFSET(bus->number, devfn, 0);
 	writel(idx, pcie->base + PCIE_EXT_CFG_INDEX);
-	return base + PCIE_EXT_CFG_DATA + (where & 0xfff);
+	return base + PCIE_EXT_CFG_DATA + PCIE_ECAM_REG(where);
 }
 
-static void __iomem *brcm_pcie_map_bus32(struct pci_bus *bus, unsigned int devfn,
-					 int where)
+static void __iomem *brcm7425_pcie_map_bus(struct pci_bus *bus,
+					   unsigned int devfn, int where)
 {
 	struct brcm_pcie *pcie = bus->sysdata;
 	void __iomem *base = pcie->base;
@@ -715,14 +714,14 @@ static void __iomem *brcm_pcie_map_bus32(struct pci_bus *bus, unsigned int devfn
 
 	/* Accesses to the RC go right to the RC registers if !devfn */
 	if (pci_is_root_bus(bus))
-		return devfn ? NULL : base + (where & 0xffc);
+		return devfn ? NULL : base + PCIE_ECAM_REG(where);
 
 	/* An access to our HW w/o link-up will cause a CPU Abort */
 	if (!brcm_pcie_link_up(pcie))
 		return NULL;
 
 	/* For devices, write to the config space index register */
-	idx = PCIE_ECAM_OFFSET(bus->number, devfn, (where & 0xffc));
+	idx = PCIE_ECAM_OFFSET(bus->number, devfn, where);
 	writel(idx, base + IDX_ADDR(pcie));
 	return base + DATA_ADDR(pcie);
 }
@@ -1082,8 +1081,8 @@ static const char * const supplies[] = {
 
 static void *alloc_subdev_regulators(struct device *dev)
 {
-	const size_t size = sizeof(struct subdev_regulators)
-		+ sizeof(struct regulator_bulk_data) * ARRAY_SIZE(supplies);
+	const size_t size = sizeof(struct subdev_regulators) +
+		sizeof(struct regulator_bulk_data) * ARRAY_SIZE(supplies);
 	struct subdev_regulators *sr;
 	int i;
 
@@ -1097,95 +1096,57 @@ static void *alloc_subdev_regulators(struct device *dev)
 	return sr;
 }
 
-static int pci_subdev_regulators_add_bus(struct pci_bus *bus)
+static int brcm_pcie_add_bus(struct pci_bus *bus)
 {
+	struct brcm_pcie *pcie = bus->sysdata;
 	struct device *dev = &bus->dev;
 	struct subdev_regulators *sr;
 	int ret;
 
-	sr = alloc_subdev_regulators(dev);
-	if (!sr)
-		return -ENOMEM;
-
-	ret = regulator_bulk_get(dev, sr->num_supplies, sr->supplies);
-	if (ret) {
-		dev_err(dev, "failed to get regulators for downstream device\n");
-		return ret;
-	}
-
-	ret = regulator_bulk_enable(sr->num_supplies, sr->supplies);
-	if (ret) {
-		dev_err(dev, "failed to enable regulators for downstream device\n");
-		regulator_bulk_free(sr->num_supplies, sr->supplies);
-		return ret;
-	}
-	dev->driver_data = sr;
-
-	return 0;
-}
+	if (!bus->parent || !pci_is_root_bus(bus->parent))
+		return 0;
 
-static int brcm_pcie_add_bus(struct pci_bus *bus)
-{
-	struct brcm_pcie *pcie = (struct brcm_pcie *) bus->sysdata;
-	struct device *dev = &bus->dev;
-	int ret;
+	if (dev->of_node) {
+		sr = alloc_subdev_regulators(dev);
+		if (!sr) {
+			dev_info(dev, "Can't allocate regulators for downstream device\n");
+			goto no_regulators;
+		}
 
-	if (!bus->parent || !pci_is_root_bus(bus->parent) || !pcie)
-		return 0;
+		pcie->sr = sr;
 
-	if (dev->of_node && dev->driver_data) {
-		/*
-		 * Oops, this is unfortunate.  We are using the port
-		 * driver's driver_data field to store our regulator info
-		 * and it appears that another driver started using it as
-		 * well.  If so, be a team player do not overwrite it.  We
-		 * may still be okay if there are no regulators.
-		 */
-		dev_err(dev, "root port dev.driver_data non-NULL; something wrong\n");
+		ret = regulator_bulk_get(dev, sr->num_supplies, sr->supplies);
+		if (ret) {
+			dev_info(dev, "No regulators for downstream device\n");
+			goto no_regulators;
+		}
 
-	} else if (dev->of_node) {
-		ret = pci_subdev_regulators_add_bus(bus);
-		/* Grab the regulators for suspend/resume */
-		pcie->sr = bus->dev.driver_data;
+		ret = regulator_bulk_enable(sr->num_supplies, sr->supplies);
+		if (ret) {
+			dev_err(dev, "Can't enable regulators for downstream device\n");
+			regulator_bulk_free(sr->num_supplies, sr->supplies);
+			pcie->sr = NULL;
+		}
 	}
 
-	/* Try to start the link. */
+no_regulators:
 	brcm_pcie_start_link(pcie);
-
-	/*
-	 * There is not much of a point to return an error as currently it
-	 * will cause a WARNING() from pci_alloc_child_bus().  So only
-	 * return the error if it is -ENOMEM.  Note that we are always
-	 * doing a dev_err() for other erros.
-	 */
-	return ret == -ENOMEM ? ret : 0;
-}
-
-static void pci_subdev_regulators_remove_bus(struct pci_bus *bus)
-{
-	struct device *dev = &bus->dev;
-	struct subdev_regulators *sr = dev->driver_data;
-
-	if (regulator_bulk_disable(sr->num_supplies, sr->supplies))
-		dev_err(dev, "failed to disable regulators for downstream device\n");
-	regulator_bulk_free(sr->num_supplies, sr->supplies);
-	dev->driver_data = NULL;
+	return 0;
 }
 
 static void brcm_pcie_remove_bus(struct pci_bus *bus)
 {
+	struct brcm_pcie *pcie = bus->sysdata;
+	struct subdev_regulators *sr = pcie->sr;
 	struct device *dev = &bus->dev;
-	struct brcm_pcie *pcie;
 
-	if (!dev->of_node || !dev->driver_data || !bus->parent ||
-	    !pci_is_root_bus(bus->parent))
+	if (!sr)
 		return;
 
-	pcie = (struct brcm_pcie *) bus->sysdata;
-	if (pcie && pcie->sr) {
-		pci_subdev_regulators_remove_bus(bus);
-		pcie->sr = NULL;
-	}
+	if (regulator_bulk_disable(sr->num_supplies, sr->supplies))
+		dev_err(dev, "Failed to disable regulators for downstream device\n");
+	regulator_bulk_free(sr->num_supplies, sr->supplies);
+	pcie->sr = NULL;
 }
 
 /* L23 is a low-power PCIe link state */
@@ -1290,7 +1251,7 @@ static int pci_dev_may_wakeup(struct pci_dev *dev, void *data)
 
 	if (device_may_wakeup(&dev->dev)) {
 		*ret = true;
-		dev_info(&dev->dev, "disable cancelled for wake-up device\n");
+		dev_info(&dev->dev, "Possible wake-up device; regulators will not be disabled\n");
 	}
 	return (int) *ret;
 }
@@ -1513,15 +1474,15 @@ static struct pci_ops brcm_pcie_ops = {
 	.read = pci_generic_config_read,
 	.write = pci_generic_config_write,
 	.add_bus = brcm_pcie_add_bus,
-	.remove_bus = brcm_pcie_remove_bus
+	.remove_bus = brcm_pcie_remove_bus,
 };
 
-static struct pci_ops brcm_pcie_ops32 = {
-	.map_bus = brcm_pcie_map_bus32,
+static struct pci_ops brcm7425_pcie_ops = {
+	.map_bus = brcm7425_pcie_map_bus,
 	.read = pci_generic_config_read32,
 	.write = pci_generic_config_write32,
 	.add_bus = brcm_pcie_add_bus,
-	.remove_bus = brcm_pcie_remove_bus
+	.remove_bus = brcm_pcie_remove_bus,
 };
 
 static int brcm_pcie_probe(struct platform_device *pdev)
@@ -1610,7 +1571,7 @@ static int brcm_pcie_probe(struct platform_device *pdev)
 		}
 	}
 
-	bridge->ops = pcie->type == BCM7425 ? &brcm_pcie_ops32 : &brcm_pcie_ops;
+	bridge->ops = pcie->type == BCM7425 ? &brcm7425_pcie_ops : &brcm_pcie_ops;
 	bridge->sysdata = pcie;
 
 	platform_set_drvdata(pdev, pcie);