diff options
author | Matthew Wilcox <matthew@wil.cx> | 2010-05-01 14:20:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:41 -0400 |
commit | 910f8d0cede74beff1eee93cf9cf2a28d7600e66 (patch) | |
tree | 663cd91c3d4ca2a71937b0dcaad51b02cae3c9c6 /include/linux/usb.h | |
parent | 1e429018b646bdf903554e92ead1cda96cc552dc (diff) |
USB: Change the scatterlist type in struct urb
Change the type of the URB's 'sg' pointer from a usb_sg_request to
a scatterlist. This allows drivers to submit scatter-gather lists
without using the usb_sg_wait() interface. It has the added benefit
of removing the typecasts that were added as part of patch as1368 (and
slightly decreasing the number of pointer dereferences).
Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index cf3b289a87a2..eec9e74f332f 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -1195,7 +1195,7 @@ struct urb { | |||
1195 | unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/ | 1195 | unsigned int transfer_flags; /* (in) URB_SHORT_NOT_OK | ...*/ |
1196 | void *transfer_buffer; /* (in) associated data buffer */ | 1196 | void *transfer_buffer; /* (in) associated data buffer */ |
1197 | dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */ | 1197 | dma_addr_t transfer_dma; /* (in) dma addr for transfer_buffer */ |
1198 | struct usb_sg_request *sg; /* (in) scatter gather buffer list */ | 1198 | struct scatterlist *sg; /* (in) scatter gather buffer list */ |
1199 | int num_sgs; /* (in) number of entries in the sg list */ | 1199 | int num_sgs; /* (in) number of entries in the sg list */ |
1200 | u32 transfer_buffer_length; /* (in) data buffer length */ | 1200 | u32 transfer_buffer_length; /* (in) data buffer length */ |
1201 | u32 actual_length; /* (return) actual transfer length */ | 1201 | u32 actual_length; /* (return) actual transfer length */ |