aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvision
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-12-29 19:49:22 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:40:40 -0500
commit134179823b3ca9c8b98e0631906459dbb022ff9b (patch)
tree9dd65815e669074a080d0abe4033dbebe832e699 /drivers/media/video/usbvision
parentcec73844a91017f9b84ca1d665feb8fc714c8410 (diff)
V4L/DVB (10130): 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_is_isoc_in(epd) usb_endpoint_is_isoc_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) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/usbvision')
-rw-r--r--drivers/media/video/usbvision/usbvision-video.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 48c8c4399eb8..85661b1848fe 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1679,7 +1679,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
1679 interface = &dev->actconfig->interface[ifnum]->altsetting[0]; 1679 interface = &dev->actconfig->interface[ifnum]->altsetting[0];
1680 } 1680 }
1681 endpoint = &interface->endpoint[1].desc; 1681 endpoint = &interface->endpoint[1].desc;
1682 if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != 1682 if (usb_endpoint_type(endpoint) !=
1683 USB_ENDPOINT_XFER_ISOC) { 1683 USB_ENDPOINT_XFER_ISOC) {
1684 err("%s: interface %d. has non-ISO endpoint!", 1684 err("%s: interface %d. has non-ISO endpoint!",
1685 __func__, ifnum); 1685 __func__, ifnum);
@@ -1687,8 +1687,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
1687 __func__, endpoint->bmAttributes); 1687 __func__, endpoint->bmAttributes);
1688 return -ENODEV; 1688 return -ENODEV;
1689 } 1689 }
1690 if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == 1690 if (usb_endpoint_dir_out(endpoint)) {
1691 USB_DIR_OUT) {
1692 err("%s: interface %d. has ISO OUT endpoint!", 1691 err("%s: interface %d. has ISO OUT endpoint!",
1693 __func__, ifnum); 1692 __func__, ifnum);
1694 return -ENODEV; 1693 return -ENODEV;