6 files changed, 13 insertions, 18 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 4459b8a7f818..fd112f0b9d35 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -447,7 +447,7 @@ static int qcm_sensor_init(struct uvd *uvd)
         CHECK_RET(ret, qcm_stv_setw(uvd->dev, 0x15c1,
                                 cpu_to_le16(ISOC_PACKET_SIZE)));
         CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x15c3, 0x08));
-        CHECK_RET(ret, ret = qcm_stv_setb(uvd->dev, 0x143f, 0x01));
+        CHECK_RET(ret, qcm_stv_setb(uvd->dev, 0x143f, 0x01));
 
         CHECK_RET(ret, qcm_stv_setb(uvd->dev, STV_ISO_ENABLE, 0x00));
 
@@ -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/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index 7c575bb8184f..148a1f98c70f 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1123,7 +1123,7 @@ static int usbvideo_v4l_open(struct inode *inode, struct file *file)
         if (uvd->debug > 1)
                 dev_info(&uvd->dev->dev, "%s($%p)\n", __func__, dev);
 
-        if (0 < usbvideo_ClientIncModCount(uvd))
+        if (usbvideo_ClientIncModCount(uvd) < 0)
                 return -ENODEV;
         mutex_lock(&uvd->lock);
 
@@ -1281,8 +1281,7 @@ static int usbvideo_v4l_close(struct inode *inode, struct file *file)
  * History:
  * 22-Jan-2000 Corrected VIDIOCSPICT to reject unsupported settings.
  */
-static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
-                                 unsigned int cmd, void *arg)
+static int usbvideo_v4l_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 {
         struct uvd *uvd = file->private_data;
 
@@ -1505,7 +1504,7 @@ static int usbvideo_v4l_do_ioctl(struct inode *inode, struct file *file,
 static int usbvideo_v4l_ioctl(struct inode *inode, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
-        return video_usercopy(inode, file, cmd, arg, usbvideo_v4l_do_ioctl);
+        return video_usercopy(file, cmd, arg, usbvideo_v4l_do_ioctl);
 }
 
 /*
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 {