diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-04-19 11:53:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:39 -0400 |
commit | 326b4810cc995209e31136af4202ed0414814ed5 (patch) | |
tree | 45c6a550e09f155c1ea14e1ee05e55ce16ece9c6 /drivers/usb/host/xhci-ring.c | |
parent | e8f4af304e3d16e7e512865bd53f3db811d9bbc8 (diff) |
USB: clean up some host controller sparse warnings
Fix usb sparse warnings:
drivers/usb/host/isp1362-hcd.c:2220:50: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-mem.c:43:24: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-mem.c:49:24: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-mem.c:161:24: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-mem.c:198:16: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-mem.c:319:31: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-mem.c:1231:33: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-pci.c:177:23: warning: non-ANSI function declaration of function 'xhci_register_pci'
drivers/usb/host/xhci-pci.c:182:26: warning: non-ANSI function declaration of function 'xhci_unregister_pci'
drivers/usb/host/xhci-ring.c:342:32: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-ring.c:525:34: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-ring.c:1009:32: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-ring.c:1031:32: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-ring.c:1041:16: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-ring.c:1096:30: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-ring.c:1100:27: warning: Using plain integer as NULL pointer
drivers/usb/host/xhci-mem.c:224:27: warning: symbol 'xhci_alloc_container_ctx' was not declared. Should it be static?
drivers/usb/host/xhci-mem.c:242:6: warning: symbol 'xhci_free_container_ctx' was not declared. Should it be static?
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Lothar Wassmann <LW@KARO-electronics.de>
Signed-off By: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 16ef5fd77ce2..9e27eb0c7004 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
@@ -388,7 +388,7 @@ static struct xhci_segment *find_trb_seg( | |||
388 | cur_seg = cur_seg->next; | 388 | cur_seg = cur_seg->next; |
389 | if (cur_seg == start_seg) | 389 | if (cur_seg == start_seg) |
390 | /* Looped over the entire list. Oops! */ | 390 | /* Looped over the entire list. Oops! */ |
391 | return 0; | 391 | return NULL; |
392 | } | 392 | } |
393 | return cur_seg; | 393 | return cur_seg; |
394 | } | 394 | } |
@@ -582,7 +582,7 @@ static void handle_stopped_endpoint(struct xhci_hcd *xhci, | |||
582 | struct xhci_ring *ep_ring; | 582 | struct xhci_ring *ep_ring; |
583 | struct xhci_virt_ep *ep; | 583 | struct xhci_virt_ep *ep; |
584 | struct list_head *entry; | 584 | struct list_head *entry; |
585 | struct xhci_td *cur_td = 0; | 585 | struct xhci_td *cur_td = NULL; |
586 | struct xhci_td *last_unlinked_td; | 586 | struct xhci_td *last_unlinked_td; |
587 | 587 | ||
588 | struct xhci_dequeue_state deq_state; | 588 | struct xhci_dequeue_state deq_state; |
@@ -1115,7 +1115,7 @@ struct xhci_segment *trb_in_td(struct xhci_segment *start_seg, | |||
1115 | 1115 | ||
1116 | do { | 1116 | do { |
1117 | if (start_dma == 0) | 1117 | if (start_dma == 0) |
1118 | return 0; | 1118 | return NULL; |
1119 | /* We may get an event for a Link TRB in the middle of a TD */ | 1119 | /* We may get an event for a Link TRB in the middle of a TD */ |
1120 | end_seg_dma = xhci_trb_virt_to_dma(cur_seg, | 1120 | end_seg_dma = xhci_trb_virt_to_dma(cur_seg, |
1121 | &cur_seg->trbs[TRBS_PER_SEGMENT - 1]); | 1121 | &cur_seg->trbs[TRBS_PER_SEGMENT - 1]); |
@@ -1137,7 +1137,7 @@ struct xhci_segment *trb_in_td(struct xhci_segment *start_seg, | |||
1137 | suspect_dma <= end_trb_dma)) | 1137 | suspect_dma <= end_trb_dma)) |
1138 | return cur_seg; | 1138 | return cur_seg; |
1139 | } | 1139 | } |
1140 | return 0; | 1140 | return NULL; |
1141 | } else { | 1141 | } else { |
1142 | /* Might still be somewhere in this segment */ | 1142 | /* Might still be somewhere in this segment */ |
1143 | if (suspect_dma >= start_dma && suspect_dma <= end_seg_dma) | 1143 | if (suspect_dma >= start_dma && suspect_dma <= end_seg_dma) |
@@ -1147,7 +1147,7 @@ struct xhci_segment *trb_in_td(struct xhci_segment *start_seg, | |||
1147 | start_dma = xhci_trb_virt_to_dma(cur_seg, &cur_seg->trbs[0]); | 1147 | start_dma = xhci_trb_virt_to_dma(cur_seg, &cur_seg->trbs[0]); |
1148 | } while (cur_seg != start_seg); | 1148 | } while (cur_seg != start_seg); |
1149 | 1149 | ||
1150 | return 0; | 1150 | return NULL; |
1151 | } | 1151 | } |
1152 | 1152 | ||
1153 | static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci, | 1153 | static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci, |
@@ -1223,11 +1223,11 @@ static int handle_tx_event(struct xhci_hcd *xhci, | |||
1223 | struct xhci_ring *ep_ring; | 1223 | struct xhci_ring *ep_ring; |
1224 | unsigned int slot_id; | 1224 | unsigned int slot_id; |
1225 | int ep_index; | 1225 | int ep_index; |
1226 | struct xhci_td *td = 0; | 1226 | struct xhci_td *td = NULL; |
1227 | dma_addr_t event_dma; | 1227 | dma_addr_t event_dma; |
1228 | struct xhci_segment *event_seg; | 1228 | struct xhci_segment *event_seg; |
1229 | union xhci_trb *event_trb; | 1229 | union xhci_trb *event_trb; |
1230 | struct urb *urb = 0; | 1230 | struct urb *urb = NULL; |
1231 | int status = -EINPROGRESS; | 1231 | int status = -EINPROGRESS; |
1232 | struct xhci_ep_ctx *ep_ctx; | 1232 | struct xhci_ep_ctx *ep_ctx; |
1233 | u32 trb_comp_code; | 1233 | u32 trb_comp_code; |