mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
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>
This commit is contained in:
parent
0b8ca72a23
commit
da13051cc7
15 changed files with 38 additions and 46 deletions
|
@ -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,
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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__);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -639,13 +639,6 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
|
|||
|
||||
#endif /* CONFIG_USB_MON || CONFIG_USB_MON_MODULE */
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
/* 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 */
|
||||
|
|
Loading…
Reference in a new issue