diff options
author | Paul Walmsley <paul@pwsan.com> | 2012-05-09 18:38:02 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-05-11 12:56:43 -0400 |
commit | 19b08b33fa4c60d66d4e341d4d1d9a6e86ffc9e6 (patch) | |
tree | 287ec18de7afa47de67349dca615fc7cb8741651 | |
parent | 121e1a73a6246df206e779cc163ce95fbd300877 (diff) |
ARM: OMAP: OTG integration: fix compiler warning
Tony reported the following compile warning after commit
eeb3711b89d68e147e05e7b43a49ecc5009dc157 ("ARM: OMAP2+: clean up some
cppcheck warnings"):
arch/arm/plat-omap/usb.c: In function 'omap_otg_init':
arch/arm/plat-omap/usb.c:40: warning: unused variable 'status'
This happens if CONFIG_ARCH_OMAP_OTG is set but
CONFIG_USB_GADGET_OMAP, CONFIG_USB_OHCI_HCD,
CONFIG_USB_OHCI_HCD_MODULE, and CONFIG_USB_OTG are all unset.
Fix by localizing the status variable to the blocks that use it.
Compile-tested only, with omap2plus_defconfig and omap2plus_defconfig
with CONFIG_USB_OHCI_HCD and CONFIG_USB_OTG enabled.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/plat-omap/usb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 5db75619f213..daa0327381b5 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
@@ -37,7 +37,6 @@ void __init | |||
37 | omap_otg_init(struct omap_usb_config *config) | 37 | omap_otg_init(struct omap_usb_config *config) |
38 | { | 38 | { |
39 | u32 syscon; | 39 | u32 syscon; |
40 | int status; | ||
41 | int alt_pingroup = 0; | 40 | int alt_pingroup = 0; |
42 | 41 | ||
43 | /* NOTE: no bus or clock setup (yet?) */ | 42 | /* NOTE: no bus or clock setup (yet?) */ |
@@ -102,6 +101,7 @@ omap_otg_init(struct omap_usb_config *config) | |||
102 | #ifdef CONFIG_USB_GADGET_OMAP | 101 | #ifdef CONFIG_USB_GADGET_OMAP |
103 | if (config->otg || config->register_dev) { | 102 | if (config->otg || config->register_dev) { |
104 | struct platform_device *udc_device = config->udc_device; | 103 | struct platform_device *udc_device = config->udc_device; |
104 | int status; | ||
105 | 105 | ||
106 | syscon &= ~DEV_IDLE_EN; | 106 | syscon &= ~DEV_IDLE_EN; |
107 | udc_device->dev.platform_data = config; | 107 | udc_device->dev.platform_data = config; |
@@ -114,6 +114,7 @@ omap_otg_init(struct omap_usb_config *config) | |||
114 | #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) | 114 | #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) |
115 | if (config->otg || config->register_host) { | 115 | if (config->otg || config->register_host) { |
116 | struct platform_device *ohci_device = config->ohci_device; | 116 | struct platform_device *ohci_device = config->ohci_device; |
117 | int status; | ||
117 | 118 | ||
118 | syscon &= ~HST_IDLE_EN; | 119 | syscon &= ~HST_IDLE_EN; |
119 | ohci_device->dev.platform_data = config; | 120 | ohci_device->dev.platform_data = config; |
@@ -126,6 +127,7 @@ omap_otg_init(struct omap_usb_config *config) | |||
126 | #ifdef CONFIG_USB_OTG | 127 | #ifdef CONFIG_USB_OTG |
127 | if (config->otg) { | 128 | if (config->otg) { |
128 | struct platform_device *otg_device = config->otg_device; | 129 | struct platform_device *otg_device = config->otg_device; |
130 | int status; | ||
129 | 131 | ||
130 | syscon &= ~OTG_IDLE_EN; | 132 | syscon &= ~OTG_IDLE_EN; |
131 | otg_device->dev.platform_data = config; | 133 | otg_device->dev.platform_data = config; |