From patchwork Thu Jun 24 13:10:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 107854 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5ODB4Od013119 for ; Thu, 24 Jun 2010 13:11:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754898Ab0FXNLC (ORCPT ); Thu, 24 Jun 2010 09:11:02 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:42944 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754810Ab0FXNLB (ORCPT ); Thu, 24 Jun 2010 09:11:01 -0400 Received: by bwz7 with SMTP id 7so207598bwz.19 for ; Thu, 24 Jun 2010 06:10:59 -0700 (PDT) Received: by 10.204.84.103 with SMTP id i39mr6511281bkl.199.1277385059024; Thu, 24 Jun 2010 06:10:59 -0700 (PDT) Received: from [192.168.11.174] (mail.dev.rtsoft.ru [213.79.90.226]) by mx.google.com with ESMTPS id jx10sm15043090bkb.9.2010.06.24.06.10.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 24 Jun 2010 06:10:58 -0700 (PDT) Message-ID: <4C235929.9030605@ru.mvista.com> Date: Thu, 24 Jun 2010 17:10:01 +0400 From: Sergei Shtylyov User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: "Gupta, Ajay Kumar" CC: "felipe.balbi@nokia.com" , "linux-usb@vger.kernel.org" , "linux-omap@vger.kernel.org" , "gregkh@suse.de" Subject: Re: [PATCH 3/8] musb: fix compilation warning in host only mode References: <1276771242-5201-1-git-send-email-ajay.gupta@ti.com> <1276771242-5201-2-git-send-email-ajay.gupta@ti.com> <1276771242-5201-3-git-send-email-ajay.gupta@ti.com> <1276771242-5201-4-git-send-email-ajay.gupta@ti.com> <20100624060338.GF8078@nokia.com> <19F8576C6E063C45BE387C64729E7394044E9E38CA@dbde02.ent.ti.com> In-Reply-To: <19F8576C6E063C45BE387C64729E7394044E9E38CA@dbde02.ent.ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 24 Jun 2010 13:11:05 +0000 (UTC) diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index a8b0440..ed6e1a4 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -704,7 +704,6 @@ static irqreturn_t musb_stage0_irq(struct musb *musb, u8 #ifdef CONFIG_USB_MUSB_HDRC_HCD if (int_usb & MUSB_INTR_CONNECT) { struct usb_hcd *hcd = musb_to_hcd(musb); - void __iomem *mbase = musb->mregs; handled = IRQ_HANDLED; musb->is_active = 1; @@ -714,12 +713,16 @@ static irqreturn_t musb_stage0_irq(struct musb #ifdef CONFIG_USB_MUSB_OTG /* flush endpoints when transitioning from Device Mode */ - if (is_peripheral_active(musb)) { - /* REVISIT HNP; just force disconnect */ - } - musb_writew(mbase, MUSB_INTRTXE, musb->epmask); - musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe); - musb_writeb(mbase, MUSB_INTRUSBE, 0xf7); + { + void __iomem *mbase = musb->mregs; + + if (is_peripheral_active(musb)) { + /* REVISIT HNP; just force disconnect */ + } + musb_writew(mbase, MUSB_INTRTXE, musb->epmask); + musb_writew(mbase, MUSB_INTRRXE, musb->epmask & 0xfffe); + musb_writeb(mbase, MUSB_INTRUSBE, 0xf7); + } #endif musb->port1_status &= ~(USB_PORT_STAT_LOW_SPEED |USB_PORT_STAT_HIGH_SPEED