[media] easycap: fix warnings: variable set but not used

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/media/easycap/easycap_low.c b/drivers/staging/media/easycap/easycap_low.c
index 59fdb8ffa282620b4738b3a50d814be85e5d99ea..0380babed22c02b62db3c8f7ceb1096ad24d4190 100644 (file)
--- a/drivers/staging/media/easycap/easycap_low.c
+++ b/drivers/staging/media/easycap/easycap_low.c
@@ -468,13 +468,17 @@ int setup_stk(struct usb_device *p, bool ntsc)
 /****************************************************************************/
 int setup_saa(struct usb_device *p, bool ntsc)
 {
-       int i, ir;
+       int i, rc;
        const struct saa7113config *cfg;
        if (!p)
                return -ENODEV;
        cfg = (ntsc) ?  saa7113configNTSC : saa7113configPAL;
-       for (i = 0; cfg[i].reg != 0xFF; i++)
-               ir = write_saa(p, cfg[i].reg, cfg[i].set);
+       for (i = 0; cfg[i].reg != 0xFF; i++) {
+               rc = write_saa(p, cfg[i].reg, cfg[i].set);
+               if (rc)
+                       dev_err(&p->dev,
+                               "Failed to set SAA register %d", cfg[i].reg);
+       }
        return 0;
 }
 /****************************************************************************/

diff --git a/drivers/staging/media/easycap/easycap_main.c b/drivers/staging/media/easycap/easycap_main.c
index 525a6b6974d30738b12743315b99629e34b21048..8ff5f38ea1964302af28c1d6d47fba5ffa5f4376 100644 (file)
--- a/drivers/staging/media/easycap/easycap_main.c
+++ b/drivers/staging/media/easycap/easycap_main.c
@@ -1199,8 +1199,6 @@ int easycap_video_dqbuf(struct easycap *peasycap, int mode)
  *  WHEN BOOLEAN PARAMETER decimatepixel IS true, ONLY THE FIELD FOR WHICH
  *  odd==false IS TRANSFERRED TO THE FRAME BUFFER.
  *
- *  THE BOOLEAN PARAMETER offerfields IS true ONLY WHEN THE USER PROGRAM
- *  CHOOSES THE OPTION V4L2_FIELD_INTERLACED.
  */
 /*---------------------------------------------------------------------------*/
 static int field2frame(struct easycap *peasycap)
@@ -1212,7 +1210,7 @@ static int field2frame(struct easycap *peasycap)
        int rc, bytesperpixel, multiplier;
        int  much, more, over, rump, caches, input;
        u8 mask, margin;
-       bool odd, isuy, decimatepixel, offerfields, badinput;
+       bool odd, isuy, decimatepixel, badinput;
 
        if (!peasycap) {
                SAY("ERROR: peasycap is NULL\n");
@@ -1228,8 +1226,6 @@ static int field2frame(struct easycap *peasycap)
                        peasycap->field_buffer[peasycap->field_read][0].input,
                        peasycap->field_read, peasycap->frame_fill);
        JOM(8, "=====  %i=bytesperpixel\n", peasycap->bytesperpixel);
-       if (peasycap->offerfields)
-               JOM(8, "===== offerfields\n");
 
 /*---------------------------------------------------------------------------*/
 /*
@@ -1251,7 +1247,6 @@ static int field2frame(struct easycap *peasycap)
 #endif /*EASYCAP_TESTCARD*/
 /*---------------------------------------------------------------------------*/
 
-       offerfields = peasycap->offerfields;
        bytesperpixel = peasycap->bytesperpixel;
        decimatepixel = peasycap->decimatepixel;
 

diff --git a/drivers/staging/media/easycap/easycap_sound.c b/drivers/staging/media/easycap/easycap_sound.c
index 353b6b7b74ebfdcc38eee57849a6d7649d4bef68..8c8bcae8ded8470886f81fac6599d88f67fb251c 100644 (file)
--- a/drivers/staging/media/easycap/easycap_sound.c
+++ b/drivers/staging/media/easycap/easycap_sound.c
@@ -592,7 +592,6 @@ static int easycap_alsa_ack(struct snd_pcm_substream *pss)
 static int easycap_alsa_trigger(struct snd_pcm_substream *pss, int cmd)
 {
        struct easycap *peasycap;
-       int retval;
 
        JOT(4, "%i=cmd cf %i=START %i=STOP\n", cmd, SNDRV_PCM_TRIGGER_START,
            SNDRV_PCM_TRIGGER_STOP);
@@ -615,7 +614,7 @@ static int easycap_alsa_trigger(struct snd_pcm_substream *pss, int cmd)
                break;
        }
        default:
-               retval = -EINVAL;
+               return -EINVAL;
        }
        return 0;
 }