15 files changed, 38 insertions, 46 deletions

diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
index a35fe61268de..0fe7e49cdc37 100644
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
@@ -255,8 +255,8 @@ static inline void hub_descriptor(struct usb_hub_descriptor *desc)
         desc->wHubCharacteristics = (__force __u16)
                 (__constant_cpu_to_le16(0x0001));
         desc->bNbrPorts = VHCI_NPORTS;
-        desc->bitmap[0] = 0xff;
-        desc->bitmap[1] = 0xff;
+        desc->DeviceRemovable[0] = 0xff;
+        desc->DeviceRemovable[1] = 0xff;
 }
 
 static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index 13b9f47feecd..f2040e8af8b1 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -1593,8 +1593,8 @@ hub_descriptor (struct usb_hub_descriptor *desc)
         desc->bDescLength = 9;
         desc->wHubCharacteristics = cpu_to_le16(0x0001);
         desc->bNbrPorts = 1;
-        desc->bitmap [0] = 0xff;
-        desc->bitmap [1] = 0xff;
+        desc->DeviceRemovable[0] = 0xff;
+        desc->DeviceRemovable[1] = 0xff;
 }
 
 static int dummy_hub_control (
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index ae0140dd9b9b..dfa1e1d371c8 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -717,8 +717,8 @@ ehci_hub_descriptor (
         desc->bDescLength = 7 + 2 * temp;
 
         /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
-        memset (&desc->bitmap [0], 0, temp);
-        memset (&desc->bitmap [temp], 0xff, temp);
+        memset(&desc->DeviceRemovable[0], 0, temp);
+        memset(&desc->DeviceRemovable[temp], 0xff, temp);
 
         temp = 0x0008;                  /* per-port overcurrent reporting */
         if (HCS_PPC (ehci->hcs_params))
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index b7dfda8a1d51..2f180dfe5371 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -1472,8 +1472,8 @@ static int get_hub_descriptor(struct usb_hcd *hcd,
                 0x0010 |        /* No over current protection */
                 0);
 
-        desc->bitmap[0] = 1 << 1;
-        desc->bitmap[1] = ~0;
+        desc->DeviceRemovable[0] = 1 << 1;
+        desc->DeviceRemovable[1] = ~0;
         return 0;
 }
 
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 0da7fc05f453..2a60a50bc420 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -951,9 +951,9 @@ static void isp116x_hub_descriptor(struct isp116x *isp116x,
         /* Power switching, device type, overcurrent. */
         desc->wHubCharacteristics = cpu_to_le16((u16) ((reg >> 8) & 0x1f));
         desc->bPwrOn2PwrGood = (u8) ((reg >> 24) & 0xff);
-        /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
-        desc->bitmap[0] = 0;
-        desc->bitmap[1] = ~0;
+        /* ports removable, and legacy PortPwrCtrlMask */
+        desc->DeviceRemovable[0] = 0;
+        desc->DeviceRemovable[1] = ~0;
 }
 
 /* Perform reset of a given port.
diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 02b742df332a..6dd94b997d97 100644
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -1552,9 +1552,9 @@ static void isp1362_hub_descriptor(struct isp1362_hcd *isp1362_hcd,
         desc->wHubCharacteristics = cpu_to_le16((reg >> 8) & 0x1f);
         DBG(0, "%s: hubcharacteristics = %02x\n", __func__, cpu_to_le16((reg >> 8) & 0x1f));
         desc->bPwrOn2PwrGood = (reg >> 24) & 0xff;
-        /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
-        desc->bitmap[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;
-        desc->bitmap[1] = ~0;
+        /* ports removable, and legacy PortPwrCtrlMask */
+        desc->DeviceRemovable[0] = desc->bNbrPorts == 1 ? 1 << 1 : 3 << 1;
+        desc->DeviceRemovable[1] = ~0;
 
         DBG(3, "%s: exit\n", __func__);
 }
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index c7c1e0aa0b8e..1c8de7666d6a 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -1751,9 +1751,9 @@ static void isp1760_hub_descriptor(struct isp1760_hcd *priv,
         temp = 1 + (ports / 8);
         desc->bDescLength = 7 + 2 * temp;
 
-        /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
-        memset(&desc->bitmap[0], 0, temp);
-        memset(&desc->bitmap[temp], 0xff, temp);
+        /* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
+        memset(&desc->DeviceRemovable[0], 0, temp);
+        memset(&desc->DeviceRemovable[temp], 0xff, temp);
 
         /* per-port overcurrent reporting */
         temp = 0x0008;
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index cddcda95b579..cd4b74f27d06 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -580,15 +580,15 @@ ohci_hub_descriptor (
             temp |= 0x0008;
         desc->wHubCharacteristics = (__force __u16)cpu_to_hc16(ohci, temp);
 
-        /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
+        /* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
         rh = roothub_b (ohci);
-        memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
-        desc->bitmap [0] = rh & RH_B_DR;
+        memset(desc->DeviceRemovable, 0xff, sizeof(desc->DeviceRemovable));
+        desc->DeviceRemovable[0] = rh & RH_B_DR;
         if (ohci->num_ports > 7) {
-                desc->bitmap [1] = (rh & RH_B_DR) >> 8;
-                desc->bitmap [2] = 0xff;
+                desc->DeviceRemovable[1] = (rh & RH_B_DR) >> 8;
+                desc->DeviceRemovable[2] = 0xff;
         } else
-                desc->bitmap [1] = 0xff;
+                desc->DeviceRemovable[1] = 0xff;
 }
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index e0cb12b573f9..ad54a4144756 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -451,9 +451,9 @@ static void ehci_hub_descriptor(struct oxu_hcd *oxu,
         temp = 1 + (ports / 8);
         desc->bDescLength = 7 + 2 * temp;
 
-        /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
-        memset(&desc->bitmap[0], 0, temp);
-        memset(&desc->bitmap[temp], 0xff, temp);
+        /* ports removable, and usb 1.0 legacy PortPwrCtrlMask */
+        memset(&desc->DeviceRemovable[0], 0, temp);
+        memset(&desc->DeviceRemovable[temp], 0xff, temp);
 
         temp = 0x0008;                  /* per-port overcurrent reporting */
         if (HCS_PPC(oxu->hcs_params))
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 3076b1cc05df..98afe75500cc 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2150,8 +2150,8 @@ static void r8a66597_hub_descriptor(struct r8a66597 *r8a66597,
         desc->bDescLength = 9;
         desc->bPwrOn2PwrGood = 0;
         desc->wHubCharacteristics = cpu_to_le16(0x0011);
-        desc->bitmap[0] = ((1 << r8a66597->max_root_hub) - 1) << 1;
-        desc->bitmap[1] = ~0;
+        desc->DeviceRemovable[0] = ((1 << r8a66597->max_root_hub) - 1) << 1;
+        desc->DeviceRemovable[1] = ~0;
 }
 
 static int r8a66597_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 2e9602a10e9b..f3899b334c73 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1111,9 +1111,9 @@ sl811h_hub_descriptor (
 
         desc->wHubCharacteristics = cpu_to_le16(temp);
 
-        /* two bitmaps:  ports removable, and legacy PortPwrCtrlMask */
-        desc->bitmap[0] = 0 << 1;
-        desc->bitmap[1] = ~0;
+        /* ports removable, and legacy PortPwrCtrlMask */
+        desc->DeviceRemovable[0] = 0 << 1;
+        desc->DeviceRemovable[1] = ~0;
 }
 
 static void
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index fab764946c74..a659e1590bca 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -2604,13 +2604,13 @@ static int u132_roothub_descriptor(struct u132 *u132,
         retval = u132_read_pcimem(u132, roothub.b, &rh_b);
         if (retval)
                 return retval;
-        memset(desc->bitmap, 0xff, sizeof(desc->bitmap));
-        desc->bitmap[0] = rh_b & RH_B_DR;
+        memset(desc->DeviceRemovable, 0xff, sizeof(desc->DeviceRemovable));
+        desc->DeviceRemovable[0] = rh_b & RH_B_DR;
         if (u132->num_ports > 7) {
-                desc->bitmap[1] = (rh_b & RH_B_DR) >> 8;
-                desc->bitmap[2] = 0xff;
+                desc->DeviceRemovable[1] = (rh_b & RH_B_DR) >> 8;
+                desc->DeviceRemovable[2] = 0xff;
         } else
-                desc->bitmap[1] = 0xff;
+                desc->DeviceRemovable[1] = 0xff;
         return 0;
 }
 
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 5d963e350494..d83c27b9725b 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -45,7 +45,6 @@ static void xhci_hub_descriptor(struct xhci_hcd *xhci,
         temp = 1 + (ports / 8);
         desc->bDescLength = 7 + 2 * temp;
 
-        /* Why does core/hcd.h define bitmap?  It's just confusing. */
         memset(&desc->DeviceRemovable[0], 0, temp);
         memset(&desc->DeviceRemovable[temp], 0xff, temp);
 
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c
index 785772e66ed0..cff246b7cb26 100644
--- a/drivers/usb/wusbcore/rh.c
+++ b/drivers/usb/wusbcore/rh.c
@@ -184,8 +184,8 @@ static int wusbhc_rh_get_hub_descr(struct wusbhc *wusbhc, u16 wValue,
         descr->bPwrOn2PwrGood = 0;
         descr->bHubContrCurrent = 0;
         /* two bitmaps:  ports removable, and usb 1.0 legacy PortPwrCtrlMask */
-        memset(&descr->bitmap[0], 0, temp);
-        memset(&descr->bitmap[temp], 0xff, temp);
+        memset(&descr->DeviceRemovable[0], 0, temp);
+        memset(&descr->DeviceRemovable[temp], 0xff, temp);
         return 0;
 }
 
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,
 
 /*-------------------------------------------------------------------------*/
 
-/* hub.h ... DeviceRemovable in 2.4.2-ac11, gone in 2.4.10 */
-/* bleech -- resurfaced in 2.4.11 or 2.4.12 */
-#define bitmap  DeviceRemovable
-
-
-/*-------------------------------------------------------------------------*/
-
 /* random stuff */
 
 #define RUN_CONTEXT (in_irq() ? "in_irq" \