releases/4.14.60/media-atomisp-ov2680-don-t-declare-unused-vars.patch

   1 From foo@baz Sat Jul 28 10:25:26 CEST 2018
   2 From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
   3 Date: Mon, 16 Apr 2018 12:37:09 -0400
   4 Subject: media: atomisp: ov2680: don't declare unused vars
   5
   6 From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
   7
   8 [ Upstream commit e5c0680fd2c44252868fe4062558925b5506b179 ]
   9
  10 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c: In function ‘__ov2680_set_exposure’:
  11 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:400:10: warning: variable ‘hts’ set but not used [-Wunused-but-set-variable]
  12   u16 vts,hts;
  13           ^~~
  14 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c: In function ‘ov2680_detect’:
  15 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c:1164:5: warning: variable ‘revision’ set but not used [-Wunused-but-set-variable]
  16   u8 revision;
  17      ^~~~~~~~
  18
  19 Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  20 Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
  21 Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  22 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  24 ---
  25  drivers/staging/media/atomisp/i2c/ov2680.c |    6 +++---
  26  1 file changed, 3 insertions(+), 3 deletions(-)
  27
  28 --- a/drivers/staging/media/atomisp/i2c/ov2680.c
  29 +++ b/drivers/staging/media/atomisp/i2c/ov2680.c
  30 @@ -396,12 +396,11 @@ static long __ov2680_set_exposure(struct
  31  {
  32         struct i2c_client *client = v4l2_get_subdevdata(sd);
  33         struct ov2680_device *dev = to_ov2680_sensor(sd);
  34 -       u16 vts,hts;
  35 +       u16 vts;
  36         int ret,exp_val;
  37
  38         dev_dbg(&client->dev, "+++++++__ov2680_set_exposure coarse_itg %d, gain %d, digitgain %d++\n",coarse_itg, gain, digitgain);
  39
  40 -       hts = ov2680_res[dev->fmt_idx].pixels_per_line;
  41         vts = ov2680_res[dev->fmt_idx].lines_per_frame;
  42
  43         /* group hold */
  44 @@ -1190,7 +1189,8 @@ static int ov2680_detect(struct i2c_clie
  45                                         OV2680_SC_CMMN_SUB_ID, &high);
  46         revision = (u8) high & 0x0f;
  47
  48 -       dev_info(&client->dev, "sensor_revision id = 0x%x\n", id);
  49 +       dev_info(&client->dev, "sensor_revision id = 0x%x, rev= %d\n",
  50 +                id, revision);
  51
  52         return 0;
  53  }