diff mbox

cbus: tahvo: Remove dead code from tahvo-usb.c

Message ID 1303201193-11516-1-git-send-email-jhnikula@gmail.com (mailing list archive)
State Accepted
Commit 9d6f6d55b6cd58ae4a8697ada7b3429f6f9d3884
Delegated to: Tony Lindgren
Headers show

Commit Message

Jarkko Nikula April 19, 2011, 8:19 a.m. UTC 
Looks like this code was ever used. It was added by commit
fe3702054f6412aea04373ceb9d27a4a417ff3f0 "OMAP: Fix USB on Nokia 770"
that can be found from linux-omap history if needed.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
 drivers/cbus/tahvo-usb.c |   48 +---------------------------------------------
 1 files changed, 1 insertions(+), 47 deletions(-)

Comments

Felipe Balbi April 19, 2011, 10:05 a.m. UTC | #1 
On Tue, Apr 19, 2011 at 11:19:53AM +0300, Jarkko Nikula wrote:
> Looks like this code was ever used. It was added by commit
> fe3702054f6412aea04373ceb9d27a4a417ff3f0 "OMAP: Fix USB on Nokia 770"
> that can be found from linux-omap history if needed.
> 
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>

FWIW:

Reviewied-by: Felipe Balbi <balbi@ti.com>
Tony Lindgren April 20, 2011, 4:12 p.m. UTC | #2 
* Felipe Balbi <balbi@ti.com> [110419 03:02]:
> On Tue, Apr 19, 2011 at 11:19:53AM +0300, Jarkko Nikula wrote:
> > Looks like this code was ever used. It was added by commit
> > fe3702054f6412aea04373ceb9d27a4a417ff3f0 "OMAP: Fix USB on Nokia 770"
> > that can be found from linux-omap history if needed.
> > 
> > Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> 
> FWIW:
> 
> Reviewied-by: Felipe Balbi <balbi@ti.com>

Both applied to the cbus branch.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index f6b3c1a..be0333f 100644
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -236,47 +236,6 @@  static DEVICE_ATTR(vbus_state, 0444, vbus_state_show, NULL);
 
 int vbus_active = 0;
 
-#if 0
-
-static int host_suspend(struct tahvo_usb *tu)
-{
-	struct device	*dev;
-
-	if (!tu->otg.host)
-		return -ENODEV;
-
-	/* Currently ASSUMES only the OTG port matters;
-	 * other ports could be active...
-	 */
-	dev = tu->otg.host->controller;
-	return dev->driver->suspend(dev, PMSG_SUSPEND);
-}
-
-static int host_resume(struct tahvo_usb *tu)
-{
-	struct device	*dev;
-
-	if (!tu->otg.host)
-		return -ENODEV;
-
-	dev = tu->otg.host->controller;
-	return dev->driver->resume(dev);
-}
-
-#else
-
-static int host_suspend(struct tahvo_usb *tu)
-{
-	return 0;
-}
-
-static int host_resume(struct tahvo_usb *tu)
-{
-	return 0;
-}
-
-#endif
-
 static void check_vbus_state(struct tahvo_usb *tu)
 {
 	int reg, prev_state;
@@ -303,7 +262,6 @@  static void check_vbus_state(struct tahvo_usb *tu)
 		case OTG_STATE_A_IDLE:
 			/* Session is now valid assuming the USB hub is driving Vbus */
 			tu->otg.state = OTG_STATE_A_HOST;
-			host_resume(tu);
 			break;
 		default:
 			break;
@@ -355,7 +313,6 @@  static void tahvo_usb_become_host(struct tahvo_usb *tu)
 
 static void tahvo_usb_stop_host(struct tahvo_usb *tu)
 {
-	host_suspend(tu);
 	tu->otg.state = OTG_STATE_A_IDLE;
 }
 
@@ -403,8 +360,6 @@  static void tahvo_usb_power_off(struct tahvo_usb *tu)
 	if (tu->otg.gadget)
 		usb_gadget_vbus_disconnect(tu->otg.gadget);
 
-	host_suspend(tu);
-
 	/* Disable OTG and interrupts */
 	if (TAHVO_MODE(tu) == TAHVO_MODE_PERIPHERAL)
 		id = OTG_ID;
@@ -521,8 +476,7 @@  static int tahvo_usb_set_host(struct otg_transceiver *otg, struct usb_bus *host)
 	if (TAHVO_MODE(tu) == TAHVO_MODE_HOST) {
 		tu->otg.host = NULL;
 		tahvo_usb_become_host(tu);
-	} else
-		host_suspend(tu);
+	}
 
 	tu->otg.host = host;