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>

5 files changed, 9 insertions, 13 deletions

diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index c710bcd1df48..f8d85ddb4804 100644
--- a/drivers/media/video/usbvideo/ibmcam.c
+++ b/drivers/media/video/usbvideo/ibmcam.c
@@ -3779,11 +3779,11 @@ static int ibmcam_probe(struct usb_interface *intf, const struct usb_device_id *
                         err("Alternate settings have different endpoint addresses!");
                         return -ENODEV;
                 }
-                if ((endpoint->bmAttributes & 0x03) != 0x01) {
+                if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) {
                         err("Interface %d. has non-ISO endpoint!", ifnum);
                         return -ENODEV;
                 }
-                if ((endpoint->bEndpointAddress & 0x80) == 0) {
+                if (usb_endpoint_dir_out(endpoint)) {
                         err("Interface %d. has ISO OUT endpoint!", ifnum);
                         return -ENODEV;
                 }
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
index da27a5287983..90f0ce6a26bc 100644
--- a/drivers/media/video/usbvideo/konicawc.c
+++ b/drivers/media/video/usbvideo/konicawc.c
@@ -823,12 +823,12 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id
                         err("Alternate settings have different endpoint addresses!");
                         return -ENODEV;
                 }
-                if ((endpoint->bmAttributes & 0x03) != 0x01) {
+                if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) {
                         err("Interface %d. has non-ISO endpoint!",
                             interface->desc.bInterfaceNumber);
                         return -ENODEV;
                 }
-                if ((endpoint->bEndpointAddress & 0x80) == 0) {
+                if (usb_endpoint_dir_out(endpoint)) {
                         err("Interface %d. has ISO OUT endpoint!",
                             interface->desc.bInterfaceNumber);
                         return -ENODEV;
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index 606402a54eba..fd112f0b9d35 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -955,8 +955,7 @@ static int qcm_probe(struct usb_interface *intf,
                 for (j=0; j < interface->desc.bNumEndpoints; j++) {
                         endpoint = &interface->endpoint[j].desc;
 
-                        if ((endpoint->bEndpointAddress &
-                                USB_ENDPOINT_DIR_MASK) != USB_DIR_IN)
+                        if (usb_endpoint_dir_out(endpoint))
                                 continue; /* not input then not good */
 
                         buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
@@ -965,9 +964,7 @@ static int qcm_probe(struct usb_interface *intf,
                                 continue; /* 0 pkt size is not what we want */
                         }
 
-                        if ((endpoint->bmAttributes &
-                                USB_ENDPOINT_XFERTYPE_MASK) ==
-                                USB_ENDPOINT_XFER_ISOC) {
+                        if (usb_endpoint_xfer_isoc(endpoint)) {
                                 video_ep = endpoint->bEndpointAddress;
                                 /* break out of the search */
                                 goto good_videoep;
diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
index 9714baab7833..839a08240c25 100644
--- a/drivers/media/video/usbvideo/ultracam.c
+++ b/drivers/media/video/usbvideo/ultracam.c
@@ -556,12 +556,12 @@ static int ultracam_probe(struct usb_interface *intf, const struct usb_device_id
                         err("Alternate settings have different endpoint addresses!");
                         return -ENODEV;
                 }
-                if ((endpoint->bmAttributes & 0x03) != 0x01) {
+                if (usb_endpoint_type(endpoint) != USB_ENDPOINT_XFER_ISOC) {
                         err("Interface %d. has non-ISO endpoint!",
                             interface->desc.bInterfaceNumber);
                         return -ENODEV;
                 }
-                if ((endpoint->bEndpointAddress & 0x80) == 0) {
+                if (usb_endpoint_dir_out(endpoint)) {
                         err("Interface %d. has ISO OUT endpoint!",
                             interface->desc.bInterfaceNumber);
                         return -ENODEV;
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index 8e2d58bec481..4602597ed8d1 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -844,8 +844,7 @@ vicam_probe( struct usb_interface *intf, const struct usb_device_id *id)
                interface->desc.bInterfaceNumber, (unsigned) (interface->desc.bNumEndpoints));
         endpoint = &interface->endpoint[0].desc;
 
-        if ((endpoint->bEndpointAddress & 0x80) &&
-            ((endpoint->bmAttributes & 3) == 0x02)) {
+        if (usb_endpoint_is_bulk_in(endpoint)) {
                 /* we found a bulk in endpoint */
                 bulkEndpoint = endpoint->bEndpointAddress;
         } else {