1 files changed, 26 insertions, 34 deletions

diff --git a/drivers/staging/media/easycap/easycap_ioctl.c b/drivers/staging/media/easycap/easycap_ioctl.c
index c99addfb624..9413b37490c 100644
--- a/drivers/staging/media/easycap/easycap_ioctl.c
+++ b/drivers/staging/media/easycap/easycap_ioctl.c
@@ -25,7 +25,6 @@
 */
 /*****************************************************************************/
 
-#include <linux/version.h>
 #include "easycap.h"
 
 /*--------------------------------------------------------------------------*/
@@ -125,7 +124,7 @@ int adjust_standard(struct easycap *peasycap, v4l2_std_id std_id)
         }
         if (peasycap->video_isoc_streaming) {
                 resubmit = true;
-                kill_video_urbs(peasycap);
+                easycap_video_kill_urbs(peasycap);
         } else
                 resubmit = false;
 /*--------------------------------------------------------------------------*/
@@ -331,7 +330,7 @@ int adjust_standard(struct easycap *peasycap, v4l2_std_id std_id)
                             "from 0x%02X to 0x%02X\n", reg, itwas, isnow);
         }
         if (resubmit)
-                submit_video_urbs(peasycap);
+                easycap_video_submit_urbs(peasycap);
         return 0;
 }
 /*****************************************************************************/
@@ -558,7 +557,7 @@ int adjust_format(struct easycap *peasycap,
                 peasycap->bytesperpixel * peasycap->width * peasycap->height;
         if (peasycap->video_isoc_streaming) {
                 resubmit = true;
-                kill_video_urbs(peasycap);
+                easycap_video_kill_urbs(peasycap);
         } else
                 resubmit = false;
 /*---------------------------------------------------------------------------*/
@@ -622,7 +621,7 @@ int adjust_format(struct easycap *peasycap,
         }
 /*---------------------------------------------------------------------------*/
         if (resubmit)
-                submit_video_urbs(peasycap);
+                easycap_video_submit_urbs(peasycap);
 
         return peasycap_best_format - easycap_format;
 }
@@ -667,16 +666,15 @@ int adjust_brightness(struct easycap *peasycap, int value)
                                 peasycap->inputset[peasycap->input].brightness_ok = 1;
                         } else
                                 JOM(8, "%i=peasycap->input\n", peasycap->input);
+
                         mood = 0x00FF & (unsigned int)peasycap->brightness;
-                        if (!write_saa(peasycap->pusb_device, 0x0A, mood)) {
-                                SAM("adjusting brightness to  0x%02X\n", mood);
-                                return 0;
-                        } else {
+                        if (write_saa(peasycap->pusb_device, 0x0A, mood)) {
                                 SAM("WARNING: failed to adjust brightness "
                                     "to 0x%02X\n", mood);
                                 return -ENOENT;
                         }
-                        break;
+                        SAM("adjusting brightness to  0x%02X\n", mood);
+                        return 0;
                 }
                 i1++;
         }
@@ -726,15 +724,13 @@ int adjust_contrast(struct easycap *peasycap, int value)
                                 JOM(8, "%i=peasycap->input\n", peasycap->input);
 
                         mood = 0x00FF & (unsigned int) (peasycap->contrast - 128);
-                        if (!write_saa(peasycap->pusb_device, 0x0B, mood)) {
-                                SAM("adjusting contrast to  0x%02X\n", mood);
-                                return 0;
-                        } else {
+                        if (write_saa(peasycap->pusb_device, 0x0B, mood)) {
                                 SAM("WARNING: failed to adjust contrast to "
                                     "0x%02X\n", mood);
                                 return -ENOENT;
                         }
-                        break;
+                        SAM("adjusting contrast to  0x%02X\n", mood);
+                        return 0;
                 }
                 i1++;
         }
@@ -784,14 +780,13 @@ int adjust_saturation(struct easycap *peasycap, int value)
                         } else
                                 JOM(8, "%i=peasycap->input\n", peasycap->input);
                         mood = 0x00FF & (unsigned int) (peasycap->saturation - 128);
-                        if (!write_saa(peasycap->pusb_device, 0x0C, mood)) {
-                                SAM("adjusting saturation to  0x%02X\n", mood);
-                                return 0;
-                        } else {
+                        if (write_saa(peasycap->pusb_device, 0x0C, mood)) {
                                 SAM("WARNING: failed to adjust saturation to "
                                     "0x%02X\n", mood);
                                 return -ENOENT;
                         }
+                        SAM("adjusting saturation to  0x%02X\n", mood);
+                        return 0;
                         break;
                 }
                 i1++;
@@ -839,13 +834,12 @@ int adjust_hue(struct easycap *peasycap, int value)
                                 JOM(8, "%i=peasycap->input\n", peasycap->input);
                         i2 = peasycap->hue - 128;
                         mood = 0x00FF & ((int) i2);
-                        if (!write_saa(peasycap->pusb_device, 0x0D, mood)) {
-                                SAM("adjusting hue to  0x%02X\n", mood);
-                                return 0;
-                        } else {
+                        if (write_saa(peasycap->pusb_device, 0x0D, mood)) {
                                 SAM("WARNING: failed to adjust hue to 0x%02X\n", mood);
                                 return -ENOENT;
                         }
+                        SAM("adjusting hue to  0x%02X\n", mood);
+                        return 0;
                         break;
                 }
                 i1++;
@@ -854,7 +848,7 @@ int adjust_hue(struct easycap *peasycap, int value)
         return -ENOENT;
 }
 /*****************************************************************************/
-int adjust_volume(struct easycap *peasycap, int value)
+static int adjust_volume(struct easycap *peasycap, int value)
 {
         s8 mood;
         int i1;
@@ -885,15 +879,13 @@ int adjust_volume(struct easycap *peasycap, int value)
                         mood = (16 > peasycap->volume) ? 16 :
                                 ((31 < peasycap->volume) ? 31 :
                                   (s8) peasycap->volume);
-                        if (!audio_gainset(peasycap->pusb_device, mood)) {
-                                SAM("adjusting volume to 0x%02X\n", mood);
-                                return 0;
-                        } else {
+                        if (!easycap_audio_gainset(peasycap->pusb_device, mood)) {
                                 SAM("WARNING: failed to adjust volume to "
                                     "0x%2X\n", mood);
                                 return -ENOENT;
                         }
-                        break;
+                        SAM("adjusting volume to 0x%02X\n", mood);
+                        return 0;
                 }
                 i1++;
         }
@@ -971,7 +963,7 @@ long easycap_unlocked_ioctl(struct file *file,
                 SAM("ERROR: peasycap->pusb_device is NULL\n");
                 return -EFAULT;
         }
-        kd = isdongle(peasycap);
+        kd = easycap_isdongle(peasycap);
         if (0 <= kd && DONGLE_MANY > kd) {
                 if (mutex_lock_interruptible(&easycapdc60_dongle[kd].mutex_video)) {
                         SAY("ERROR: cannot lock "
@@ -986,7 +978,7 @@ long easycap_unlocked_ioctl(struct file *file,
  *  IF NECESSARY, BAIL OUT.
  */
 /*---------------------------------------------------------------------------*/
-                if (kd != isdongle(peasycap))
+                if (kd != easycap_isdongle(peasycap))
                         return -ERESTARTSYS;
                 if (!file) {
                         SAY("ERROR:  file is NULL\n");
@@ -1226,7 +1218,7 @@ long easycap_unlocked_ioctl(struct file *file,
                         return -EINVAL;
                 }
 
-                rc = newinput(peasycap, (int)index);
+                rc = easycap_newinput(peasycap, (int)index);
                 if (0 == rc) {
                         JOM(8, "newinput(.,%i) OK\n", (int)index);
                 } else {
@@ -2209,7 +2201,7 @@ long easycap_unlocked_ioctl(struct file *file,
 
                 if (!peasycap->polled) {
                         do {
-                                rcdq = easycap_dqbuf(peasycap, 0);
+                                rcdq = easycap_video_dqbuf(peasycap, 0);
                                 if (-EIO == rcdq) {
                                         JOM(8, "returning -EIO because "
                                             "dqbuf() returned -EIO\n");
@@ -2313,7 +2305,7 @@ long easycap_unlocked_ioctl(struct file *file,
                         mutex_unlock(&easycapdc60_dongle[kd].mutex_video);
                         return -EFAULT;
                 }
-                submit_video_urbs(peasycap);
+                easycap_video_submit_urbs(peasycap);
                 peasycap->video_idle = 0;
                 peasycap->audio_idle = 0;
                 peasycap->video_eof = 0;