Linux on ARM based TI OMAP SoCs
 help / color / mirror / Atom feed
From: Kishon Vijay Abraham I <kishon@ti.com>
To: balbi@ti.com, gregkh@linuxfoundation.org,
	linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: tony@atomide.com, notasas@gmail.com,
	Kishon Vijay Abraham I <kishon@ti.com>
Subject: [PATCH v2 1/4] usb: musb: omap: remove the check before calling otg_set_vbus
Date: Thu, 14 Mar 2013 11:53:56 +0530	[thread overview]
Message-ID: <1363242239-1061-2-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1363242239-1061-1-git-send-email-kishon@ti.com>

No functional change. otg_set_vbus is already protected so removed the
check before calling otg_set_vbus.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 drivers/usb/musb/omap2430.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 29014c0..6071484 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -174,8 +174,7 @@ static void omap2430_musb_set_vbus(struct musb *musb, int is_on)
 				}
 			}
 
-			if (otg->set_vbus)
-				otg_set_vbus(otg, 1);
+			otg_set_vbus(otg, 1);
 		} else {
 			musb->is_active = 1;
 			otg->default_a = 1;
@@ -297,10 +296,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
 		}
 
 		omap2430_musb_set_vbus(musb, 0);
-		if (data->interface_type == MUSB_INTERFACE_UTMI) {
-			if (musb->xceiv->otg->set_vbus)
-				otg_set_vbus(musb->xceiv->otg, 0);
-		}
+		if (data->interface_type == MUSB_INTERFACE_UTMI)
+			otg_set_vbus(musb->xceiv->otg, 0);
 		omap_control_usb_set_mode(glue->control_otghs,
 			USB_MODE_DISCONNECT);
 		break;
-- 
1.7.10.4

  reply	other threads:[~2013-03-14  6:23 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-14  6:23 [PATCH v2 0/4] usb: musb/otg: cleanup and fixes Kishon Vijay Abraham I
2013-03-14  6:23 ` Kishon Vijay Abraham I [this message]
2013-03-14  6:23 ` [PATCH v2 2/4] usb: otg: twl4030: use devres API for regulator get and request irq Kishon Vijay Abraham I
2013-03-14 15:48   ` Felipe Balbi
     [not found]     ` <20130314154811.GA3001-S8G//mZuvNWo5Im9Ml3/Zg@public.gmane.org>
2013-03-15 12:00       ` Grazvydas Ignotas
2013-03-15 12:05         ` Felipe Balbi
2013-03-14  6:23 ` [PATCH v2 3/4] usb: musb: omap: add usb_phy_init in omap2430_musb_init Kishon Vijay Abraham I
2013-03-14  6:23 ` [PATCH v2 4/4] usb: otg: twl4030: fix cold plug on OMAP3 Kishon Vijay Abraham I
     [not found]   ` <1363242239-1061-5-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2013-03-14 15:49     ` Felipe Balbi
2013-03-14 13:33 ` [PATCH v2 0/4] usb: musb/otg: cleanup and fixes Felipe Balbi
2013-03-14 14:45   ` kishon
2013-03-14 14:47     ` Felipe Balbi
2013-03-14 14:48       ` kishon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1363242239-1061-2-git-send-email-kishon@ti.com \
    --to=kishon@ti.com \
    --cc=balbi@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=notasas@gmail.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox