aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/twl4030_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/twl4030_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/twl4030_charger.c')
-rw-r--r--drivers/power/twl4030_charger.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index fdad850c77d3..fcddd115cc08 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -479,7 +479,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
479 479
480 INIT_WORK(&bci->work, twl4030_bci_usb_work); 480 INIT_WORK(&bci->work, twl4030_bci_usb_work);
481 481
482 bci->transceiver = usb_get_transceiver(); 482 bci->transceiver = usb_get_phy();
483 if (bci->transceiver != NULL) { 483 if (bci->transceiver != NULL) {
484 bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; 484 bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
485 usb_register_notifier(bci->transceiver, &bci->usb_nb); 485 usb_register_notifier(bci->transceiver, &bci->usb_nb);
@@ -509,7 +509,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
509fail_unmask_interrupts: 509fail_unmask_interrupts:
510 if (bci->transceiver != NULL) { 510 if (bci->transceiver != NULL) {
511 usb_unregister_notifier(bci->transceiver, &bci->usb_nb); 511 usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
512 usb_put_transceiver(bci->transceiver); 512 usb_put_phy(bci->transceiver);
513 } 513 }
514 free_irq(bci->irq_bci, bci); 514 free_irq(bci->irq_bci, bci);
515fail_bci_irq: 515fail_bci_irq:
@@ -540,7 +540,7 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
540 540
541 if (bci->transceiver != NULL) { 541 if (bci->transceiver != NULL) {
542 usb_unregister_notifier(bci->transceiver, &bci->usb_nb); 542 usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
543 usb_put_transceiver(bci->transceiver); 543 usb_put_phy(bci->transceiver);
544 } 544 }
545 free_irq(bci->irq_bci, bci); 545 free_irq(bci->irq_bci, bci);
546 free_irq(bci->irq_chg, bci); 546 free_irq(bci->irq_chg, bci);