From: Mauro Carvalho Chehab Date: Wed, 1 Aug 2018 14:16:48 +0000 (-0400) Subject: media: tvp5150: get rid of some warnings X-Git-Tag: v4.20-rc1~69^2~165 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c135e99748fe543da9dedca4d2dde77434c4c910;p=thirdparty%2Flinux.git media: tvp5150: get rid of some warnings The recent tvp5150 patchset added two new warnings: drivers/media/i2c/tvp5150.c: In function 'tvp5150_querystd': drivers/media/i2c/tvp5150.c:829:18: warning: unused variable 'decoder' [-Wunused-variable] struct tvp5150 *decoder = to_tvp5150(sd); ^~~~~~~ drivers/media/i2c/tvp5150.c:1522:6: warning: no previous prototype for 'tvp5150_volatile_reg' [-Wmissing-prototypes] bool tvp5150_volatile_reg(struct device *dev, unsigned int reg) ^~~~~~~~~~~~~~~~~~~~ Get rid of them. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c index f4cd73d90f7f0..f5b234e4599dc 100644 --- a/drivers/media/i2c/tvp5150.c +++ b/drivers/media/i2c/tvp5150.c @@ -826,8 +826,6 @@ static int query_lock(struct v4l2_subdev *sd) static int tvp5150_querystd(struct v4l2_subdev *sd, v4l2_std_id *std_id) { - struct tvp5150 *decoder = to_tvp5150(sd); - *std_id = query_lock(sd) ? tvp5150_read_std(sd) : V4L2_STD_UNKNOWN; return 0; @@ -1484,7 +1482,7 @@ static const struct regmap_range tvp5150_readable_ranges[] = { }, }; -bool tvp5150_volatile_reg(struct device *dev, unsigned int reg) +static bool tvp5150_volatile_reg(struct device *dev, unsigned int reg) { switch (reg) { case TVP5150_VERT_LN_COUNT_MSB: