From: Benoit Goby <benoit@android.com>
Date: Thu, 10 May 2012 23:41:40 +0000 (-0700)
Subject: usb: otg: otg-wakelock: Fix build for 3.4
X-Git-Tag: firefly_0821_release~2958^2~394
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d428b2ae73ecdddf8566b3dbd9a602c8fe9dc0ec;p=firefly-linux-kernel-4.4.55.git

usb: otg: otg-wakelock: Fix build for 3.4

Change-Id: I97e21e9e6645bf18522675039e512f85fe836794
Signed-off-by: Benoit Goby <benoit@android.com>
---

diff --git a/drivers/usb/phy/otg-wakelock.c b/drivers/usb/phy/otg-wakelock.c
index ffd8d8aa5dc8..e17e27299062 100644
--- a/drivers/usb/phy/otg-wakelock.c
+++ b/drivers/usb/phy/otg-wakelock.c
@@ -25,7 +25,7 @@
 #define TEMPORARY_HOLD_TIME	2000
 
 static bool enabled = true;
-static struct otg_transceiver *otgwl_xceiv;
+static struct usb_phy *otgwl_xceiv;
 static struct notifier_block otgwl_nb;
 
 /*
@@ -139,10 +139,10 @@ static int __init otg_wakelock_init(void)
 {
 	int ret;
 
-	otgwl_xceiv = otg_get_transceiver();
+	otgwl_xceiv = usb_get_transceiver();
 
 	if (!otgwl_xceiv) {
-		pr_err("%s: No OTG transceiver found\n", __func__);
+		pr_err("%s: No USB transceiver found\n", __func__);
 		return -ENODEV;
 	}
 
@@ -152,10 +152,10 @@ static int __init otg_wakelock_init(void)
 		       vbus_lock.name);
 
 	otgwl_nb.notifier_call = otgwl_otg_notifications;
-	ret = otg_register_notifier(otgwl_xceiv, &otgwl_nb);
+	ret = usb_register_notifier(otgwl_xceiv, &otgwl_nb);
 
 	if (ret) {
-		pr_err("%s: otg_register_notifier on transceiver %s"
+		pr_err("%s: usb_register_notifier on transceiver %s"
 		       " failed\n", __func__,
 		       dev_name(otgwl_xceiv->dev));
 		otgwl_xceiv = NULL;