Remove the struct qcom_pcie.dev member, which is a duplicate of the generic pp.dev member. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> --- drivers/pci/host/pcie-qcom.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/pci/host/pcie-qcom.c b/drivers/pci/host/pcie-qcom.c index e425fcf..915e70a 100644 --- a/drivers/pci/host/pcie-qcom.c +++ b/drivers/pci/host/pcie-qcom.c @@ -87,7 +87,6 @@ struct qcom_pcie_ops { struct qcom_pcie { struct pcie_port pp; - struct device *dev; union qcom_pcie_resources res; void __iomem *parf; void __iomem *elbi; @@ -135,7 +134,7 @@ static int qcom_pcie_establish_link(struct qcom_pcie *qcom) static int qcom_pcie_get_resources_v0(struct qcom_pcie *qcom) { struct qcom_pcie_resources_v0 *res = &qcom->res.v0; - struct device *dev = qcom->dev; + struct device *dev = qcom->pp.dev; res->vdda = devm_regulator_get(dev, "vdda"); if (IS_ERR(res->vdda)) @@ -187,7 +186,7 @@ static int qcom_pcie_get_resources_v0(struct qcom_pcie *qcom) static int qcom_pcie_get_resources_v1(struct qcom_pcie *qcom) { struct qcom_pcie_resources_v1 *res = &qcom->res.v1; - struct device *dev = qcom->dev; + struct device *dev = qcom->pp.dev; res->vdda = devm_regulator_get(dev, "vdda"); if (IS_ERR(res->vdda)) @@ -236,7 +235,7 @@ static void qcom_pcie_deinit_v0(struct qcom_pcie *qcom) static int qcom_pcie_init_v0(struct qcom_pcie *qcom) { struct qcom_pcie_resources_v0 *res = &qcom->res.v0; - struct device *dev = qcom->dev; + struct device *dev = qcom->pp.dev; u32 val; int ret; @@ -358,7 +357,7 @@ static void qcom_pcie_deinit_v1(struct qcom_pcie *qcom) static int qcom_pcie_init_v1(struct qcom_pcie *qcom) { struct qcom_pcie_resources_v1 *res = &qcom->res.v1; - struct device *dev = qcom->dev; + struct device *dev = qcom->pp.dev; int ret; ret = reset_control_deassert(res->core); @@ -511,7 +510,6 @@ static int qcom_pcie_probe(struct platform_device *pdev) pp = &qcom->pp; qcom->ops = (struct qcom_pcie_ops *)of_device_get_match_data(dev); - qcom->dev = dev; qcom->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_LOW); if (IS_ERR(qcom->reset)) -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html