From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kishon Vijay Abraham I 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 Message-ID: <1363242239-1061-2-git-send-email-kishon@ti.com> References: <1363242239-1061-1-git-send-email-kishon@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1363242239-1061-1-git-send-email-kishon@ti.com> Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: linux-omap@vger.kernel.org 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 --- 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