Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 820d0883 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: power: pda_power: check against CONFIG_USB_PHY 



CONFIG_USB_OTG_UTILS will be removed very
soon, so we should check CONFIG_USB_PHY
instead.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent edc7cb2e

drivers/power/pda_power.c

+7 −7
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static struct timer_list supply_timer; 
static struct timer_list polling_timer;

static int polling;



#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

static struct usb_phy *transceiver;

static struct notifier_block otg_nb;

#endif
@@ -218,7 +218,7 @@ static void polling_timer_func(unsigned long unused) 
		  jiffies + msecs_to_jiffies(pdata->polling_interval));

}



#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

static int otg_is_usb_online(void)

{

	return (transceiver->last_event == USB_EVENT_VBUS ||
@@ -315,7 +315,7 @@ static int pda_power_probe(struct platform_device *pdev) 
		pda_psy_usb.num_supplicants = pdata->num_supplicants;

	}



#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

	transceiver = usb_get_phy(USB_PHY_TYPE_USB2);

	if (!IS_ERR_OR_NULL(transceiver)) {

		if (!pdata->is_usb_online)
@@ -367,7 +367,7 @@ static int pda_power_probe(struct platform_device *pdev) 
		}

	}



#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

	if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {

		otg_nb.notifier_call = otg_handle_notification;

		ret = usb_register_notifier(transceiver, &otg_nb);
@@ -391,7 +391,7 @@ static int pda_power_probe(struct platform_device *pdev) 


	return 0;



#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

otg_reg_notifier_failed:

	if (pdata->is_usb_online && usb_irq)

		free_irq(usb_irq->start, &pda_psy_usb);
@@ -402,7 +402,7 @@ static int pda_power_probe(struct platform_device *pdev) 
usb_supply_failed:

	if (pdata->is_ac_online && ac_irq)

		free_irq(ac_irq->start, &pda_psy_ac);

#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

	if (!IS_ERR_OR_NULL(transceiver))

		usb_put_phy(transceiver);

#endif
@@ -437,7 +437,7 @@ static int pda_power_remove(struct platform_device *pdev) 
		power_supply_unregister(&pda_psy_usb);

	if (pdata->is_ac_online)

		power_supply_unregister(&pda_psy_ac);

#ifdef CONFIG_USB_OTG_UTILS

#if IS_ENABLED(CONFIG_USB_PHY)

	if (!IS_ERR_OR_NULL(transceiver))

		usb_put_phy(transceiver);

#endif