aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/pda_power.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power/pda_power.c')
-rw-r--r--drivers/power/pda_power.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index fd49689738a..214468f4444 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -40,7 +40,7 @@ static struct timer_list polling_timer;
40static int polling; 40static int polling;
41 41
42#ifdef CONFIG_USB_OTG_UTILS 42#ifdef CONFIG_USB_OTG_UTILS
43static struct otg_transceiver *transceiver; 43static struct usb_phy *transceiver;
44static struct notifier_block otg_nb; 44static struct notifier_block otg_nb;
45#endif 45#endif
46 46
@@ -321,7 +321,7 @@ static int pda_power_probe(struct platform_device *pdev)
321 } 321 }
322 322
323#ifdef CONFIG_USB_OTG_UTILS 323#ifdef CONFIG_USB_OTG_UTILS
324 transceiver = otg_get_transceiver(); 324 transceiver = usb_get_transceiver();
325 if (transceiver && !pdata->is_usb_online) { 325 if (transceiver && !pdata->is_usb_online) {
326 pdata->is_usb_online = otg_is_usb_online; 326 pdata->is_usb_online = otg_is_usb_online;
327 } 327 }
@@ -375,7 +375,7 @@ static int pda_power_probe(struct platform_device *pdev)
375#ifdef CONFIG_USB_OTG_UTILS 375#ifdef CONFIG_USB_OTG_UTILS
376 if (transceiver && pdata->use_otg_notifier) { 376 if (transceiver && pdata->use_otg_notifier) {
377 otg_nb.notifier_call = otg_handle_notification; 377 otg_nb.notifier_call = otg_handle_notification;
378 ret = otg_register_notifier(transceiver, &otg_nb); 378 ret = usb_register_notifier(transceiver, &otg_nb);
379 if (ret) { 379 if (ret) {
380 dev_err(dev, "failure to register otg notifier\n"); 380 dev_err(dev, "failure to register otg notifier\n");
381 goto otg_reg_notifier_failed; 381 goto otg_reg_notifier_failed;
@@ -409,7 +409,7 @@ usb_supply_failed:
409 free_irq(ac_irq->start, &pda_psy_ac); 409 free_irq(ac_irq->start, &pda_psy_ac);
410#ifdef CONFIG_USB_OTG_UTILS 410#ifdef CONFIG_USB_OTG_UTILS
411 if (transceiver) 411 if (transceiver)
412 otg_put_transceiver(transceiver); 412 usb_put_transceiver(transceiver);
413#endif 413#endif
414ac_irq_failed: 414ac_irq_failed:
415 if (pdata->is_ac_online) 415 if (pdata->is_ac_online)
@@ -444,7 +444,7 @@ static int pda_power_remove(struct platform_device *pdev)
444 power_supply_unregister(&pda_psy_ac); 444 power_supply_unregister(&pda_psy_ac);
445#ifdef CONFIG_USB_OTG_UTILS 445#ifdef CONFIG_USB_OTG_UTILS
446 if (transceiver) 446 if (transceiver)
447 otg_put_transceiver(transceiver); 447 usb_put_transceiver(transceiver);
448#endif 448#endif
449 if (ac_draw) { 449 if (ac_draw) {
450 regulator_put(ac_draw); 450 regulator_put(ac_draw);