Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[MTD] [NAND] alauda: 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

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 Woodhouse <David.Woodhouse@intel.com>

authored by

Julia Lawall and committed by
David Woodhouse
232ed5e6 353816f4

+3 -3
+3 -3
drivers/mtd/nand/alauda.c
··· 676 676 goto error; 677 677 678 678 al->write_out = usb_sndbulkpipe(al->dev, 679 - ep_wr->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); 679 + usb_endpoint_num(ep_wr)); 680 680 al->bulk_in = usb_rcvbulkpipe(al->dev, 681 - ep_in->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); 681 + usb_endpoint_num(ep_in)); 682 682 al->bulk_out = usb_sndbulkpipe(al->dev, 683 - ep_out->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); 683 + usb_endpoint_num(ep_out)); 684 684 685 685 /* second device is identical up to now */ 686 686 memcpy(al+1, al, sizeof(*al));