leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: otg: isp1301_omap: resolve unused variable warning from gcc

Browse Source 
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>
This commit is contained in:
Paul Walmsley 2012-04-20 15:29:20 -06:00 committed by Felipe Balbi
parent f8f5701bda
commit 79d6680f01
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/otg/isp1301_omap.c
View File

@ -1336,9 +1336,6 @@ static int
isp1301_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget) isp1301_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget)
{ {
struct isp1301 *isp = container_of(otg->phy, struct isp1301, phy); struct isp1301 *isp = container_of(otg->phy, struct isp1301, phy);
#ifndef CONFIG_USB_OTG
u32 l;
#endif
if (!otg || isp != the_transceiver) if (!otg || isp != the_transceiver)
return -ENODEV; return -ENODEV;
@ -1365,10 +1362,14 @@ isp1301_set_peripheral(struct usb_otg *otg, struct usb_gadget *gadget)
otg->gadget = gadget; otg->gadget = gadget;
// FIXME update its refcount // FIXME update its refcount
{
u32 l;
l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK; l = omap_readl(OTG_CTRL) & OTG_CTRL_MASK;
l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS); l &= ~(OTG_XCEIV_OUTPUTS|OTG_CTRL_BITS);
l |= OTG_ID; l |= OTG_ID;
omap_writel(l, OTG_CTRL); omap_writel(l, OTG_CTRL);
}
power_up(isp); power_up(isp);
isp->phy.state = OTG_STATE_B_IDLE; isp->phy.state = OTG_STATE_B_IDLE;