aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/isp1704_charger.c
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2012-06-22 07:32:45 -0400
committerFelipe Balbi <balbi@ti.com>2012-06-25 07:04:26 -0400
commit721002ec1dd55a52425455826af49cf8853b2d4f (patch)
tree41d990b5f1a14d9e7bda9258083ee2628bf736e1 /drivers/power/isp1704_charger.c
parent6b03b13336ee5d8da7bda8799c9ed990e3daedcc (diff)
usb: otg: utils: rename function name in OTG utils
_transceiver() in otg.c is replaced with _phy. usb_set_transceiver is replaced with usb_add_phy to make it similar to other usb standard function names like usb_add_hcd. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/power/isp1704_charger.c')
-rw-r--r--drivers/power/isp1704_charger.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index e5ccd2979773..50773ae6f72e 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -415,7 +415,7 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
415 if (!isp) 415 if (!isp)
416 return -ENOMEM; 416 return -ENOMEM;
417 417
418 isp->phy = usb_get_transceiver(); 418 isp->phy = usb_get_phy();
419 if (!isp->phy) 419 if (!isp->phy)
420 goto fail0; 420 goto fail0;
421 421
@@ -475,7 +475,7 @@ fail2:
475 power_supply_unregister(&isp->psy); 475 power_supply_unregister(&isp->psy);
476fail1: 476fail1:
477 isp1704_charger_set_power(isp, 0); 477 isp1704_charger_set_power(isp, 0);
478 usb_put_transceiver(isp->phy); 478 usb_put_phy(isp->phy);
479fail0: 479fail0:
480 kfree(isp); 480 kfree(isp);
481 481
@@ -490,7 +490,7 @@ static int __devexit isp1704_charger_remove(struct platform_device *pdev)
490 490
491 usb_unregister_notifier(isp->phy, &isp->nb); 491 usb_unregister_notifier(isp->phy, &isp->nb);
492 power_supply_unregister(&isp->psy); 492 power_supply_unregister(&isp->psy);
493 usb_put_transceiver(isp->phy); 493 usb_put_phy(isp->phy);
494 isp1704_charger_set_power(isp, 0); 494 isp1704_charger_set_power(isp, 0);
495 kfree(isp); 495 kfree(isp);
496 496