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

USB: "sparse" cleanups for usb gadgets

Browse Source 
This removes complaints about the gadget stack which are generated by
the currrent "sparse":  it doesn't like the fact that zero is the null
pointer.  (Last I checked, C guarantees that's correct ...)

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Brownell
2007-07-30 12:31:07 -07:00
committed by Greg Kroah-Hartman
parent bc71e479cd
commit a947522697
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/gadget/config.c
View File

@@ -50,7 +50,7 @@ usb_descriptor_fillbuf(void *buf, unsigned buflen,
return -EINVAL; return -EINVAL;
/* fill buffer from src[] until null descriptor ptr */ /* fill buffer from src[] until null descriptor ptr */
for (; 0 != *src; src++) { for (; NULL != *src; src++) {
unsigned len = (*src)->bLength; unsigned len = (*src)->bLength;
if (len > buflen) if (len > buflen)

2
drivers/usb/gadget/epautoconf.c
View File

@@ -71,7 +71,7 @@ ep_matches (
u16 max; u16 max;
/* endpoint already claimed? */ /* endpoint already claimed? */
if (0 != ep->driver_data) if (NULL != ep->driver_data)
return 0; return 0;
/* only support ep0 for portable CONTROL traffic */ /* only support ep0 for portable CONTROL traffic */

3
drivers/usb/gadget/ether.c
View File

@@ -1723,7 +1723,8 @@ rx_submit (struct eth_dev *dev, struct usb_request *req, gfp_t gfp_flags)
size += sizeof (struct rndis_packet_msg_type); size += sizeof (struct rndis_packet_msg_type);
size -= size % dev->out_ep->maxpacket; size -= size % dev->out_ep->maxpacket;
if ((skb = alloc_skb (size + NET_IP_ALIGN, gfp_flags)) == 0) { skb = alloc_skb(size + NET_IP_ALIGN, gfp_flags);
if (skb == NULL) {
DEBUG (dev, "no rx skb\n"); DEBUG (dev, "no rx skb\n");
goto enomem; goto enomem;
} }

4
drivers/usb/gadget/inode.c
View File

@@ -964,7 +964,7 @@ static int setup_req (struct usb_ep *ep, struct usb_request *req, u16 len)
} }
if (len > sizeof (dev->rbuf)) if (len > sizeof (dev->rbuf))
req->buf = kmalloc(len, GFP_ATOMIC); req->buf = kmalloc(len, GFP_ATOMIC);
if (req->buf == 0) { if (req->buf == NULL) {
req->buf = dev->rbuf; req->buf = dev->rbuf;
return -ENOMEM; return -ENOMEM;
} }
@@ -1394,7 +1394,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
dev->setup_abort = 0; dev->setup_abort = 0;
if (dev->state == STATE_DEV_UNCONNECTED) { if (dev->state == STATE_DEV_UNCONNECTED) {
#ifdef CONFIG_USB_GADGET_DUALSPEED #ifdef CONFIG_USB_GADGET_DUALSPEED
if (gadget->speed == USB_SPEED_HIGH && dev->hs_config == 0) { if (gadget->speed == USB_SPEED_HIGH && dev->hs_config == NULL) {
spin_unlock(&dev->lock); spin_unlock(&dev->lock);
ERROR (dev, "no high speed config??\n"); ERROR (dev, "no high speed config??\n");
return -EINVAL; return -EINVAL;

2
drivers/usb/gadget/m66592-udc.c
View File

@@ -1299,7 +1299,7 @@ static int m66592_queue(struct usb_ep *_ep, struct usb_request *_req,
req->req.actual = 0; req->req.actual = 0;
req->req.status = -EINPROGRESS; req->req.status = -EINPROGRESS;
if (ep->desc == 0) /* control */ if (ep->desc == NULL) /* control */
start_ep0(ep, req); start_ep0(ep, req);
else { else {
if (request && !ep->busy) if (request && !ep->busy)

6
drivers/usb/gadget/zero.c
View File

@@ -653,7 +653,8 @@ set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags)
result = usb_ep_enable (ep, d); result = usb_ep_enable (ep, d);
if (result == 0) { if (result == 0) {
ep->driver_data = dev; ep->driver_data = dev;
if (source_sink_start_ep (ep, gfp_flags) != 0) { if (source_sink_start_ep(ep, gfp_flags)
!= NULL) {
dev->in_ep = ep; dev->in_ep = ep;
continue; continue;
} }
@@ -667,7 +668,8 @@ set_source_sink_config (struct zero_dev *dev, gfp_t gfp_flags)
result = usb_ep_enable (ep, d); result = usb_ep_enable (ep, d);
if (result == 0) { if (result == 0) {
ep->driver_data = dev; ep->driver_data = dev;
if (source_sink_start_ep (ep, gfp_flags) != 0) { if (source_sink_start_ep(ep, gfp_flags)
!= NULL) {
dev->out_ep = ep; dev->out_ep = ep;
continue; continue;
} }