8 files changed, 17 insertions, 25 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 84191c9dc54..e776699b62f 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1981,8 +1981,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         endpoint = &interface->cur_altsetting->endpoint[0].desc;
 
         /* check if the device has the iso in endpoint at the correct place */
-        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-            USB_ENDPOINT_XFER_ISOC &&
+        if (usb_endpoint_xfer_isoc(endpoint)
+            &&
             (interface->altsetting[1].endpoint[0].desc.wMaxPacketSize == 940)) {
                 /* It's a newer em2874/em2875 device */
                 isoc_pipe = 0;
@@ -1990,11 +1990,11 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 int check_interface = 1;
                 isoc_pipe = 1;
                 endpoint = &interface->cur_altsetting->endpoint[1].desc;
-                if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
+                if (usb_endpoint_type(endpoint) !=
                     USB_ENDPOINT_XFER_ISOC)
                         check_interface = 0;
 
-                if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT)
+                if (usb_endpoint_dir_out(endpoint))
                         check_interface = 0;
 
                 if (!check_interface) {
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index 5566c2379d6..f9516d0f3c1 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -1396,12 +1396,9 @@ static int stk_camera_probe(struct usb_interface *interface,
                 endpoint = &iface_desc->endpoint[i].desc;
 
                 if (!dev->isoc_ep
-                        && ((endpoint->bEndpointAddress
-                                & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN)
-                        && ((endpoint->bmAttributes
-                                & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_ISOC)) {
+                        && usb_endpoint_is_isoc_in(endpoint)) {
                         /* we found an isoc in endpoint */
-                        dev->isoc_ep = (endpoint->bEndpointAddress & 0xF);
+                        dev->isoc_ep = usb_endpoint_num(endpoint);
                         break;
                 }
         }
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
index c710bcd1df4..f8d85ddb480 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 da27a528798..90f0ce6a26b 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 606402a54eb..fd112f0b9d3 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 9714baab783..839a08240c2 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 8e2d58bec48..4602597ed8d 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 {
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 48c8c4399eb..85661b1848f 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,
                 interface = &dev->actconfig->interface[ifnum]->altsetting[0];
         }
         endpoint = &interface->endpoint[1].desc;
-        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
+        if (usb_endpoint_type(endpoint) !=
             USB_ENDPOINT_XFER_ISOC) {
                 err("%s: interface %d. has non-ISO endpoint!",
                     __func__, ifnum);
@@ -1687,8 +1687,7 @@ static int __devinit usbvision_probe(struct usb_interface *intf,
                     __func__, endpoint->bmAttributes);
                 return -ENODEV;
         }
-        if ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) ==
-            USB_DIR_OUT) {
+        if (usb_endpoint_dir_out(endpoint)) {
                 err("%s: interface %d. has ISO OUT endpoint!",
                     __func__, ifnum);
                 return -ENODEV;