]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
usb: chipidea: ci13xxx_imx: remove 'phy_np'
authorFabio Estevam <fabio.estevam@freescale.com>
Thu, 13 Jun 2013 14:59:51 +0000 (17:59 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Jun 2013 20:45:46 +0000 (13:45 -0700)
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>
drivers/usb/chipidea/ci13xxx_imx.c

index 5fac2a1b53e3f3743be042d33436470afc6e759d..9cecfd517b7820dd0d1715b7deb5ca433d0be4d7 100644 (file)
@@ -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;
 }