lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] USB: dummy_hcd: sparse cleanups

Browse Source 
This patch fixes the byte-ordering issue for setup packets in the
dummy_hcd driver and cleans up a few things that sparse -Wbitwise
dislikes.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern
2005-05-10 15:28:38 -04:00
committed by Greg Kroah-Hartman
parent f070693009
commit cc095b0b5b
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/usb/gadget/dummy_hcd.c
View File

@@ -734,7 +734,7 @@ show_function (struct device *dev, struct device_attribute *attr, char *buf)
return 0; return 0;
return scnprintf (buf, PAGE_SIZE, "%s\n", dum->driver->function); return scnprintf (buf, PAGE_SIZE, "%s\n", dum->driver->function);
} }
DEVICE_ATTR (function, S_IRUGO, show_function, NULL); static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
@@ -857,6 +857,9 @@ EXPORT_SYMBOL (usb_gadget_unregister_driver);
#undef is_enabled #undef is_enabled
/* just declare this in any driver that really need it */
extern int net2280_set_fifo_mode (struct usb_gadget *gadget, int mode);
int net2280_set_fifo_mode (struct usb_gadget *gadget, int mode) int net2280_set_fifo_mode (struct usb_gadget *gadget, int mode)
{ {
return -ENOSYS; return -ENOSYS;
@@ -1122,7 +1125,6 @@ static int periodic_bytes (struct dummy *dum, struct dummy_ep *ep)
/* high bandwidth mode */ /* high bandwidth mode */
tmp = le16_to_cpu(ep->desc->wMaxPacketSize); tmp = le16_to_cpu(ep->desc->wMaxPacketSize);
tmp = le16_to_cpu (tmp);
tmp = (tmp >> 11) & 0x03; tmp = (tmp >> 11) & 0x03;
tmp *= 8 /* applies to entire frame */; tmp *= 8 /* applies to entire frame */;
limit += limit * tmp; limit += limit * tmp;
@@ -1265,9 +1267,14 @@ restart:
struct usb_ctrlrequest setup; struct usb_ctrlrequest setup;
int value = 1; int value = 1;
struct dummy_ep *ep2; struct dummy_ep *ep2;
unsigned w_index;
unsigned w_value;
setup = *(struct usb_ctrlrequest*) urb->setup_packet; setup = *(struct usb_ctrlrequest*) urb->setup_packet;
if (setup.wLength != urb->transfer_buffer_length) { w_index = le16_to_cpu(setup.wIndex);
w_value = le16_to_cpu(setup.wValue);
if (le16_to_cpu(setup.wLength) !=
urb->transfer_buffer_length) {
maybe_set_status (urb, -EOVERFLOW); maybe_set_status (urb, -EOVERFLOW);
goto return_urb; goto return_urb;
} }
@@ -1297,16 +1304,16 @@ restart:
case USB_REQ_SET_ADDRESS: case USB_REQ_SET_ADDRESS:
if (setup.bRequestType != Dev_Request) if (setup.bRequestType != Dev_Request)
break; break;
dum->address = setup.wValue; dum->address = w_value;
maybe_set_status (urb, 0); maybe_set_status (urb, 0);
dev_dbg (udc_dev(dum), "set_address = %d\n", dev_dbg (udc_dev(dum), "set_address = %d\n",
setup.wValue); w_value);
value = 0; value = 0;
break; break;
case USB_REQ_SET_FEATURE: case USB_REQ_SET_FEATURE:
if (setup.bRequestType == Dev_Request) { if (setup.bRequestType == Dev_Request) {
value = 0; value = 0;
switch (setup.wValue) { switch (w_value) {
case USB_DEVICE_REMOTE_WAKEUP: case USB_DEVICE_REMOTE_WAKEUP:
break; break;
case USB_DEVICE_B_HNP_ENABLE: case USB_DEVICE_B_HNP_ENABLE:
@@ -1324,14 +1331,13 @@ restart:
} }
if (value == 0) { if (value == 0) {
dum->devstatus |= dum->devstatus |=
(1 << setup.wValue); (1 << w_value);
maybe_set_status (urb, 0); maybe_set_status (urb, 0);
} }
} else if (setup.bRequestType == Ep_Request) { } else if (setup.bRequestType == Ep_Request) {
// endpoint halt // endpoint halt
ep2 = find_endpoint (dum, ep2 = find_endpoint (dum, w_index);
setup.wIndex);
if (!ep2) { if (!ep2) {
value = -EOPNOTSUPP; value = -EOPNOTSUPP;
break; break;
@@ -1343,7 +1349,7 @@ restart:
break; break;
case USB_REQ_CLEAR_FEATURE: case USB_REQ_CLEAR_FEATURE:
if (setup.bRequestType == Dev_Request) { if (setup.bRequestType == Dev_Request) {
switch (setup.wValue) { switch (w_value) {
case USB_DEVICE_REMOTE_WAKEUP: case USB_DEVICE_REMOTE_WAKEUP:
dum->devstatus &= ~(1 << dum->devstatus &= ~(1 <<
USB_DEVICE_REMOTE_WAKEUP); USB_DEVICE_REMOTE_WAKEUP);
@@ -1356,8 +1362,7 @@ restart:
} }
} else if (setup.bRequestType == Ep_Request) { } else if (setup.bRequestType == Ep_Request) {
// endpoint halt // endpoint halt
ep2 = find_endpoint (dum, ep2 = find_endpoint (dum, w_index);
setup.wIndex);
if (!ep2) { if (!ep2) {
value = -EOPNOTSUPP; value = -EOPNOTSUPP;
break; break;
@@ -1383,7 +1388,7 @@ restart:
if (urb->transfer_buffer_length > 0) { if (urb->transfer_buffer_length > 0) {
if (setup.bRequestType == if (setup.bRequestType ==
Ep_InRequest) { Ep_InRequest) {
ep2 = find_endpoint (dum, setup.wIndex); ep2 = find_endpoint (dum, w_index);
if (!ep2) { if (!ep2) {
value = -EOPNOTSUPP; value = -EOPNOTSUPP;
break; break;
@@ -1535,7 +1540,8 @@ hub_descriptor (struct usb_hub_descriptor *desc)
memset (desc, 0, sizeof *desc); memset (desc, 0, sizeof *desc);
desc->bDescriptorType = 0x29; desc->bDescriptorType = 0x29;
desc->bDescLength = 9; desc->bDescLength = 9;
desc->wHubCharacteristics = __constant_cpu_to_le16 (0x0001); desc->wHubCharacteristics = (__force __u16)
(__constant_cpu_to_le16 (0x0001));
desc->bNbrPorts = 1; desc->bNbrPorts = 1;
desc->bitmap [0] = 0xff; desc->bitmap [0] = 0xff;
desc->bitmap [1] = 0xff; desc->bitmap [1] = 0xff;
@@ -1581,7 +1587,7 @@ static int dummy_hub_control (
hub_descriptor ((struct usb_hub_descriptor *) buf); hub_descriptor ((struct usb_hub_descriptor *) buf);
break; break;
case GetHubStatus: case GetHubStatus:
*(u32 *) buf = __constant_cpu_to_le32 (0); *(__le32 *) buf = __constant_cpu_to_le32 (0);
break; break;
case GetPortStatus: case GetPortStatus:
if (wIndex != 1) if (wIndex != 1)
@@ -1621,8 +1627,8 @@ static int dummy_hub_control (
} }
} }
set_link_state (dum); set_link_state (dum);
((u16 *) buf)[0] = cpu_to_le16 (dum->port_status); ((__le16 *) buf)[0] = cpu_to_le16 (dum->port_status);
((u16 *) buf)[1] = cpu_to_le16 (dum->port_status >> 16); ((__le16 *) buf)[1] = cpu_to_le16 (dum->port_status >> 16);
break; break;
case SetHubFeature: case SetHubFeature:
retval = -EPIPE; retval = -EPIPE;