From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Thu, 13 Jun 2013 14:59:51 +0000 (+0300)
Subject: usb: chipidea: ci13xxx_imx: remove 'phy_np'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=05f6353b830768d2f3ac34005975e78b4dc7ec45;p=linux-beck.git

usb: chipidea: ci13xxx_imx: remove 'phy_np'

There is no need to keep a local 'phy_np' as we can directly use the private
structure in data->phy_np.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c
index 5fac2a1b53e3..9cecfd517b78 100644
--- a/drivers/usb/chipidea/ci13xxx_imx.c
+++ b/drivers/usb/chipidea/ci13xxx_imx.c
@@ -99,7 +99,6 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
 {
 	struct ci13xxx_imx_data *data;
 	struct platform_device *phy_pdev;
-	struct device_node *phy_np;
 	struct resource *res;
 	int ret;
 
@@ -133,10 +132,9 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	phy_np = of_parse_phandle(pdev->dev.of_node, "fsl,usbphy", 0);
-	if (phy_np) {
-		data->phy_np = phy_np;
-		phy_pdev = of_find_device_by_node(phy_np);
+	data->phy_np = of_parse_phandle(pdev->dev.of_node, "fsl,usbphy", 0);
+	if (data->phy_np) {
+		phy_pdev = of_find_device_by_node(data->phy_np);
 		if (phy_pdev) {
 			struct usb_phy *phy;
 			phy = pdev_to_phy(phy_pdev);
@@ -211,8 +209,8 @@ err:
 	if (data->reg_vbus)
 		regulator_disable(data->reg_vbus);
 put_np:
-	if (phy_np)
-		of_node_put(phy_np);
+	if (data->phy_np)
+		of_node_put(data->phy_np);
 	clk_disable_unprepare(data->clk);
 	return ret;
 }