Skip to content

Commit

Permalink
usb: chipidea: ci13xxx_imx: remove 'phy_np'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Fabio Estevam authored and Greg Kroah-Hartman committed Jun 17, 2013
1 parent 785dabe commit 05f6353
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions drivers/usb/chipidea/ci13xxx_imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -211,8 +209,8 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
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;
}
Expand Down

0 comments on commit 05f6353

Please sign in to comment.