diff mbox

[10/10] PCI: imx6: Add local struct device pointers

Message ID 20161007163958.25776.72538.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:39 p.m. UTC 
Use a local "struct device *dev" for brevity and consistency with other
drivers.  No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/host/pci-imx6.c |   77 ++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 37 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/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index 9f35f3a..d737a1d 100644
--- a/drivers/pci/host/pci-imx6.c
+++ b/drivers/pci/host/pci-imx6.c
@@ -304,13 +304,14 @@  static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6)
 static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6)
 {
 	struct pcie_port *pp = &imx6->pp;
+	struct device *dev = pp->dev;
 	int ret = 0;
 
 	switch (imx6->variant) {
 	case IMX6SX:
 		ret = clk_prepare_enable(imx6->pcie_inbound_axi);
 		if (ret) {
-			dev_err(pp->dev, "unable to enable pcie_axi clock\n");
+			dev_err(dev, "unable to enable pcie_axi clock\n");
 			break;
 		}
 
@@ -340,29 +341,30 @@  static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6)
 static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6)
 {
 	struct pcie_port *pp = &imx6->pp;
+	struct device *dev = pp->dev;
 	int ret;
 
 	ret = clk_prepare_enable(imx6->pcie_phy);
 	if (ret) {
-		dev_err(pp->dev, "unable to enable pcie_phy clock\n");
+		dev_err(dev, "unable to enable pcie_phy clock\n");
 		return;
 	}
 
 	ret = clk_prepare_enable(imx6->pcie_bus);
 	if (ret) {
-		dev_err(pp->dev, "unable to enable pcie_bus clock\n");
+		dev_err(dev, "unable to enable pcie_bus clock\n");
 		goto err_pcie_bus;
 	}
 
 	ret = clk_prepare_enable(imx6->pcie);
 	if (ret) {
-		dev_err(pp->dev, "unable to enable pcie clock\n");
+		dev_err(dev, "unable to enable pcie clock\n");
 		goto err_pcie;
 	}
 
 	ret = imx6_pcie_enable_ref_clk(imx6);
 	if (ret) {
-		dev_err(pp->dev, "unable to enable pcie ref clock\n");
+		dev_err(dev, "unable to enable pcie ref clock\n");
 		goto err_ref_clk;
 	}
 
@@ -439,12 +441,13 @@  static void imx6_pcie_init_phy(struct imx6_pcie *imx6)
 static int imx6_pcie_wait_for_link(struct imx6_pcie *imx6)
 {
 	struct pcie_port *pp = &imx6->pp;
+	struct device *dev = pp->dev;
 
 	/* check if the link is up or not */
 	if (!dw_pcie_wait_for_link(pp))
 		return 0;
 
-	dev_dbg(pp->dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
+	dev_dbg(dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
 		dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R0),
 		dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R1));
 	return -ETIMEDOUT;
@@ -453,6 +456,7 @@  static int imx6_pcie_wait_for_link(struct imx6_pcie *imx6)
 static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6)
 {
 	struct pcie_port *pp = &imx6->pp;
+	struct device *dev = pp->dev;
 	u32 tmp;
 	unsigned int retries;
 
@@ -464,7 +468,7 @@  static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6)
 		usleep_range(100, 1000);
 	}
 
-	dev_err(pp->dev, "Speed change timeout\n");
+	dev_err(dev, "Speed change timeout\n");
 	return -EINVAL;
 }
 
@@ -479,6 +483,7 @@  static irqreturn_t imx6_pcie_msi_handler(int irq, void *arg)
 static int imx6_pcie_establish_link(struct imx6_pcie *imx6)
 {
 	struct pcie_port *pp = &imx6->pp;
+	struct device *dev = pp->dev;
 	u32 tmp;
 	int ret;
 
@@ -498,7 +503,7 @@  static int imx6_pcie_establish_link(struct imx6_pcie *imx6)
 
 	ret = imx6_pcie_wait_for_link(imx6);
 	if (ret) {
-		dev_info(pp->dev, "Link never came up\n");
+		dev_info(dev, "Link never came up\n");
 		goto err_reset_phy;
 	}
 
@@ -509,7 +514,7 @@  static int imx6_pcie_establish_link(struct imx6_pcie *imx6)
 		tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2;
 		dw_pcie_writel_rc(pp, tmp, PCIE_RC_LCR);
 	} else {
-		dev_info(pp->dev, "Link: Gen2 disabled\n");
+		dev_info(dev, "Link: Gen2 disabled\n");
 	}
 
 	/*
@@ -522,23 +527,23 @@  static int imx6_pcie_establish_link(struct imx6_pcie *imx6)
 
 	ret = imx6_pcie_wait_for_speed_change(imx6);
 	if (ret) {
-		dev_err(pp->dev, "Failed to bring link up!\n");
+		dev_err(dev, "Failed to bring link up!\n");
 		goto err_reset_phy;
 	}
 
 	/* Make sure link training is finished as well! */
 	ret = imx6_pcie_wait_for_link(imx6);
 	if (ret) {
-		dev_err(pp->dev, "Failed to bring link up!\n");
+		dev_err(dev, "Failed to bring link up!\n");
 		goto err_reset_phy;
 	}
 
 	tmp = dw_pcie_readl_rc(pp, PCIE_RC_LCSR);
-	dev_info(pp->dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf);
+	dev_info(dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf);
 	return 0;
 
 err_reset_phy:
-	dev_dbg(pp->dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n",
+	dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n",
 		dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R0),
 		dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R1));
 	imx6_pcie_reset_phy(imx6);
@@ -575,21 +580,22 @@  static int __init imx6_add_pcie_port(struct imx6_pcie *imx6,
 				     struct platform_device *pdev)
 {
 	struct pcie_port *pp = &imx6->pp;
+	struct device *dev = pp->dev;
 	int ret;
 
 	if (IS_ENABLED(CONFIG_PCI_MSI)) {
 		pp->msi_irq = platform_get_irq_byname(pdev, "msi");
 		if (pp->msi_irq <= 0) {
-			dev_err(&pdev->dev, "failed to get MSI irq\n");
+			dev_err(dev, "failed to get MSI irq\n");
 			return -ENODEV;
 		}
 
-		ret = devm_request_irq(&pdev->dev, pp->msi_irq,
+		ret = devm_request_irq(dev, pp->msi_irq,
 				       imx6_pcie_msi_handler,
 				       IRQF_SHARED | IRQF_NO_THREAD,
 				       "mx6-pcie-msi", imx6);
 		if (ret) {
-			dev_err(&pdev->dev, "failed to request MSI irq\n");
+			dev_err(dev, "failed to request MSI irq\n");
 			return ret;
 		}
 	}
@@ -599,7 +605,7 @@  static int __init imx6_add_pcie_port(struct imx6_pcie *imx6,
 
 	ret = dw_pcie_host_init(pp);
 	if (ret) {
-		dev_err(&pdev->dev, "failed to initialize host\n");
+		dev_err(dev, "failed to initialize host\n");
 		return ret;
 	}
 
@@ -608,28 +614,29 @@  static int __init imx6_add_pcie_port(struct imx6_pcie *imx6,
 
 static int __init imx6_pcie_probe(struct platform_device *pdev)
 {
+	struct device *dev = &pdev->dev;
 	struct imx6_pcie *imx6;
 	struct pcie_port *pp;
-	struct device_node *np = pdev->dev.of_node;
+	struct device_node *np = dev->of_node;
 	struct resource *dbi_base;
 	int ret;
 
-	imx6 = devm_kzalloc(&pdev->dev, sizeof(*imx6), GFP_KERNEL);
+	imx6 = devm_kzalloc(dev, sizeof(*imx6), GFP_KERNEL);
 	if (!imx6)
 		return -ENOMEM;
 
 	pp = &imx6->pp;
-	pp->dev = &pdev->dev;
+	pp->dev = dev;
 
 	imx6->variant =
-		(enum imx6_pcie_variants)of_device_get_match_data(&pdev->dev);
+		(enum imx6_pcie_variants)of_device_get_match_data(dev);
 
 	/* Added for PCI abort handling */
 	hook_fault_code(16 + 6, imx6q_pcie_abort_handler, SIGBUS, 0,
 		"imprecise external abort");
 
 	dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	pp->dbi_base = devm_ioremap_resource(&pdev->dev, dbi_base);
+	pp->dbi_base = devm_ioremap_resource(dev, dbi_base);
 	if (IS_ERR(pp->dbi_base))
 		return PTR_ERR(pp->dbi_base);
 
@@ -638,44 +645,40 @@  static int __init imx6_pcie_probe(struct platform_device *pdev)
 	imx6->gpio_active_high = of_property_read_bool(np,
 						"reset-gpio-active-high");
 	if (gpio_is_valid(imx6->reset_gpio)) {
-		ret = devm_gpio_request_one(&pdev->dev, imx6->reset_gpio,
+		ret = devm_gpio_request_one(dev, imx6->reset_gpio,
 				imx6->gpio_active_high ?
 					GPIOF_OUT_INIT_HIGH :
 					GPIOF_OUT_INIT_LOW,
 				"PCIe reset");
 		if (ret) {
-			dev_err(&pdev->dev, "unable to get reset gpio\n");
+			dev_err(dev, "unable to get reset gpio\n");
 			return ret;
 		}
 	}
 
 	/* Fetch clocks */
-	imx6->pcie_phy = devm_clk_get(&pdev->dev, "pcie_phy");
+	imx6->pcie_phy = devm_clk_get(dev, "pcie_phy");
 	if (IS_ERR(imx6->pcie_phy)) {
-		dev_err(&pdev->dev,
-			"pcie_phy clock source missing or invalid\n");
+		dev_err(dev, "pcie_phy clock source missing or invalid\n");
 		return PTR_ERR(imx6->pcie_phy);
 	}
 
-	imx6->pcie_bus = devm_clk_get(&pdev->dev, "pcie_bus");
+	imx6->pcie_bus = devm_clk_get(dev, "pcie_bus");
 	if (IS_ERR(imx6->pcie_bus)) {
-		dev_err(&pdev->dev,
-			"pcie_bus clock source missing or invalid\n");
+		dev_err(dev, "pcie_bus clock source missing or invalid\n");
 		return PTR_ERR(imx6->pcie_bus);
 	}
 
-	imx6->pcie = devm_clk_get(&pdev->dev, "pcie");
+	imx6->pcie = devm_clk_get(dev, "pcie");
 	if (IS_ERR(imx6->pcie)) {
-		dev_err(&pdev->dev,
-			"pcie clock source missing or invalid\n");
+		dev_err(dev, "pcie clock source missing or invalid\n");
 		return PTR_ERR(imx6->pcie);
 	}
 
 	if (imx6->variant == IMX6SX) {
-		imx6->pcie_inbound_axi = devm_clk_get(&pdev->dev,
-							   "pcie_inbound_axi");
+		imx6->pcie_inbound_axi = devm_clk_get(dev, "pcie_inbound_axi");
 		if (IS_ERR(imx6->pcie_inbound_axi)) {
-			dev_err(&pdev->dev,
+			dev_err(dev,
 				"pcie_incbound_axi clock missing or invalid\n");
 			return PTR_ERR(imx6->pcie_inbound_axi);
 		}
@@ -685,7 +688,7 @@  static int __init imx6_pcie_probe(struct platform_device *pdev)
 	imx6->iomuxc_gpr =
 		 syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
 	if (IS_ERR(imx6->iomuxc_gpr)) {
-		dev_err(&pdev->dev, "unable to find iomuxc registers\n");
+		dev_err(dev, "unable to find iomuxc registers\n");
 		return PTR_ERR(imx6->iomuxc_gpr);
 	}