diff options
author | Julia Lawall <julia@diku.dk> | 2008-12-29 05:20:42 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-05 06:59:02 -0500 |
commit | 232ed5e68a969b1717afdb1d4c49146e5beb5465 (patch) | |
tree | 44eff60690f610e004773d09d6d3718e5bc9feb4 /drivers | |
parent | 353816f43d1fb340ff2d9a911dd5d0799c09f6a5 (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/nand/alauda.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c index 962380394855..6d9649159a18 100644 --- a/drivers/mtd/nand/alauda.c +++ b/drivers/mtd/nand/alauda.c | |||
@@ -676,11 +676,11 @@ static int alauda_probe(struct usb_interface *interface, | |||
676 | goto error; | 676 | goto error; |
677 | 677 | ||
678 | al->write_out = usb_sndbulkpipe(al->dev, | 678 | al->write_out = usb_sndbulkpipe(al->dev, |
679 | ep_wr->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); | 679 | usb_endpoint_num(ep_wr)); |
680 | al->bulk_in = usb_rcvbulkpipe(al->dev, | 680 | al->bulk_in = usb_rcvbulkpipe(al->dev, |
681 | ep_in->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); | 681 | usb_endpoint_num(ep_in)); |
682 | al->bulk_out = usb_sndbulkpipe(al->dev, | 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 | /* second device is identical up to now */ | 685 | /* second device is identical up to now */ |
686 | memcpy(al+1, al, sizeof(*al)); | 686 | memcpy(al+1, al, sizeof(*al)); |