aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/usb
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2010-11-30 18:55:51 -0500
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-03-13 21:07:07 -0400
commitda13051cc756756f10b2da8ea97b05bdf84bd7bb (patch)
treed4036bb80a731da1eeaa57211afe37f3fc000056 /include/linux/usb
parent0b8ca72a23df365a413e03f991bc6b8179dee13f (diff)
USB: Remove bitmap #define from hcd.h
Using a #define to redefine a common variable name is a bad thing, especially when the #define is in a header. include/linux/usb/hcd.h redefined bitmap to DeviceRemovable to avoid typing a long field in the hub descriptor. This has unintended side effects for files like drivers/usb/core/devio.c that include that file, since another header included after hcd.h has different variables named bitmap. Remove the bitmap #define and replace instances of it in the host controller code. Cleanup the spaces around function calls and square brackets while we're at it. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> Cc: Tony Olech <tony.olech@elandigitalsystems.com> Cc: "Robert P. J. Day" <rpjday@crashcourse.ca> Cc: Max Vozeler <mvz@vozeler.com> Cc: Tejun Heo <tj@kernel.org> Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Cc: Rodolfo Giometti <giometti@linux.it> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Anton Vorontsov <avorontsov@mvista.com> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Lothar Wassmann <LW@KARO-electronics.de> Cc: Olav Kongas <ok@artecdesign.ee> Cc: Martin Fuzzey <mfuzzey@gmail.com> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'include/linux/usb')
-rw-r--r--include/linux/usb/hcd.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 8b65068c6af9..0be61970074e 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -641,13 +641,6 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
641 641
642/*-------------------------------------------------------------------------*/ 642/*-------------------------------------------------------------------------*/
643 643
644/* hub.h ... DeviceRemovable in 2.4.2-ac11, gone in 2.4.10 */
645/* bleech -- resurfaced in 2.4.11 or 2.4.12 */
646#define bitmap DeviceRemovable
647
648
649/*-------------------------------------------------------------------------*/
650
651/* random stuff */ 644/* random stuff */
652 645
653#define RUN_CONTEXT (in_irq() ? "in_irq" \ 646#define RUN_CONTEXT (in_irq() ? "in_irq" \