diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-04-20 15:29:20 -0600 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-06-04 19:26:00 +0300 |
| commit | 79d6680f017a8084ae746f5d845a4fdc4f3a5e43 (patch) | |
| tree | b51f01121adcbb7e7ca7be21ab45f46212970bb2 /drivers/usb | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
| download | blackbird-op-linux-79d6680f017a8084ae746f5d845a4fdc4f3a5e43.tar.gz blackbird-op-linux-79d6680f017a8084ae746f5d845a4fdc4f3a5e43.zip | |
usb: otg: isp1301_omap: resolve unused variable warning from gcc
Resolve this build warning:
drivers/usb/otg/isp1301_omap.c: In function 'isp1301_set_peripheral':
drivers/usb/otg/isp1301_omap.c:1340:6: warning: unused variable 'l'
This shows up when building with the 'omap1_defconfig' and
'5912osk_testconfig' configs from git://git.pwsan.com/omap_kconfigs.
Compile-tested only.
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/otg/isp1301_omap.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c index 70cf5d7bca48..33cd709b084e 100644 --- a/drivers/usb/otg/isp1301_omap.c +++ b/drivers/usb/otg/isp1301_omap.c @@ -1336,9 +1336,6 @@ static int isp1301_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget) { struct isp1301 *isp = container_of(otg->phy, struct isp1301, phy); -#ifndef CONFIG_USB_OTG - u32 l; -#endif if (!otg || isp != the_transceiver) return -ENODEV; @@ -1365,10 +1362,14 @@ isp1301_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget) otg->gadget = gadget; // FIXME update its refcount - l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK; - l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS); - l |= OTG_ID; - omap_writel(l, OTG_CTRL); + { + u32 l; + + l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK; + l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS); + l |= OTG_ID; + omap_writel(l, OTG_CTRL); + } power_up(isp); isp->phy.state = OTG_STATE_B_IDLE; |
