]>
 
 
pilppa.org Git - linux-2.6-omap-h63xx.git/commit 
 
 
 
 
 
 
drivers/net/usb: use USB API functions rather than constants 
 
This set of patches introduces calls to the following set of functions: 
 
usb_endpoint_dir_in(epd) 
usb_endpoint_dir_out(epd) 
usb_endpoint_is_bulk_in(epd) 
usb_endpoint_is_bulk_out(epd) 
usb_endpoint_is_int_in(epd) 
usb_endpoint_is_int_out(epd) 
usb_endpoint_num(epd) 
usb_endpoint_type(epd) 
usb_endpoint_xfer_bulk(epd) 
usb_endpoint_xfer_control(epd) 
usb_endpoint_xfer_int(epd) 
usb_endpoint_xfer_isoc(epd) 
 
In some cases, introducing one of these functions is not possible, and it 
just replaces an explicit integer value by one of the following constants: 
 
USB_ENDPOINT_XFER_BULK 
USB_ENDPOINT_XFER_CONTROL 
USB_ENDPOINT_XFER_INT 
USB_ENDPOINT_XFER_ISOC 
 
In drivers/net/wireless/zd1211rw/zd_usb.c the code: 
 
(endpoint->bEndpointAddress & USB_TYPE_MASK) == USB_DIR_OUT 
 
is suspicious.  If it is intended to use USB_ENDPOINT_DIR_MASK rather than 
USB_TYPE_MASK, then the whole conditional test could be converted to a call 
to usb_endpoint_is_bulk_in. 
 
An extract of the semantic patch that makes these changes is as follows: 
(http://www.emn.fr/x-info/coccinelle/) 
 
// <smpl> 
@r1@ struct usb_endpoint_descriptor *epd; @@ 
 
- ((epd->bmAttributes & \(USB_ENDPOINT_XFERTYPE_MASK\|3\)) == 
- \(USB_ENDPOINT_XFER_CONTROL\|0\)) 
+ usb_endpoint_xfer_control(epd) 
 
@r5@ struct usb_endpoint_descriptor *epd; @@ 
 
- ((epd->bEndpointAddress & \(USB_ENDPOINT_DIR_MASK\|0x80\)) == 
-  \(USB_DIR_IN\|0x80\)) 
+ usb_endpoint_dir_in(epd) 
 
@inc@ 
@@ 
 
#include <linux/usb.h> 
 
@depends on !inc && (r1||r5)@ 
@@ 
 
+ #include <linux/usb.h> 
  #include <linux/usb/...> 
// </smpl> 
 
Signed-off-by: Julia Lawall <julia@diku.dk>  
Signed-off-by: David S. Miller <davem@davemloft.net>