diff mbox

[2/5] PCI: qcom: Remove redundant struct qcom_pcie.dbi

Message ID 20161007164300.26464.22576.stgit@bhelgaas-glaptop2.roam.corp.google.com (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Bjorn Helgaas Oct. 7, 2016, 4:43 p.m. UTC 
Remove the struct qcom_pcie.dbi member, which is a duplicate of the generic
pp.dbi_base member.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/host/pcie-qcom.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pci/host/pcie-qcom.c b/drivers/pci/host/pcie-qcom.c
index e72e038..e425fcf 100644
--- a/drivers/pci/host/pcie-qcom.c
+++ b/drivers/pci/host/pcie-qcom.c
@@ -90,7 +90,6 @@  struct qcom_pcie {
 	struct device *dev;
 	union qcom_pcie_resources res;
 	void __iomem *parf;
-	void __iomem *dbi;
 	void __iomem *elbi;
 	struct phy *phy;
 	struct gpio_desc *reset;
@@ -426,7 +425,7 @@  err_res:
 static int qcom_pcie_link_up(struct pcie_port *pp)
 {
 	struct qcom_pcie *qcom = to_qcom_pcie(pp);
-	u16 val = readw(qcom->dbi + PCIE20_CAP + PCI_EXP_LNKSTA);
+	u16 val = readw(qcom->pp.dbi_base + PCIE20_CAP + PCI_EXP_LNKSTA);
 
 	return !!(val & PCI_EXP_LNKSTA_DLLLA);
 }
@@ -509,6 +508,8 @@  static int qcom_pcie_probe(struct platform_device *pdev)
 	if (!qcom)
 		return -ENOMEM;
 
+	pp = &qcom->pp;
+
 	qcom->ops = (struct qcom_pcie_ops *)of_device_get_match_data(dev);
 	qcom->dev = dev;
 
@@ -522,9 +523,9 @@  static int qcom_pcie_probe(struct platform_device *pdev)
 		return PTR_ERR(qcom->parf);
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
-	qcom->dbi = devm_ioremap_resource(dev, res);
-	if (IS_ERR(qcom->dbi))
-		return PTR_ERR(qcom->dbi);
+	pp->dbi_base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(pp->dbi_base))
+		return PTR_ERR(pp->dbi_base);
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi");
 	qcom->elbi = devm_ioremap_resource(dev, res);
@@ -539,9 +540,7 @@  static int qcom_pcie_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	pp = &qcom->pp;
 	pp->dev = dev;
-	pp->dbi_base = qcom->dbi;
 	pp->root_bus_nr = -1;
 	pp->ops = &qcom_pcie_dw_ops;