diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 15:07:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:09 -0400 |
commit | 92d474bd298da37957a3dde8705ff3e8bf84e386 (patch) | |
tree | d9b048e7d38dc5ce0bc9f91b98e277976d7323fc /drivers/media/video/tvaudio.c | |
parent | 5b9a6f37ab019456d15f6e2e45ebdb9f4c5a0d25 (diff) |
V4L/DVB: tvaudio: remove obsolete tda8425 initialization
The tda8425 initialization function sets up the inputmap for riva boards.
After some digging I discovered that this was for the V4L rivatv driver
that is found on sourceforge. This driver hasn't been maintained since the
last 5 years and will no longer work with the current v4l framework.
So we can safely remove this.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tvaudio.c')
-rw-r--r-- | drivers/media/video/tvaudio.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 9a836e0efb47..a25e2b5e1944 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -1226,18 +1226,6 @@ static int tea6320_initialize(struct CHIPSTATE * chip) | |||
1226 | static int tda8425_shift10(int val) { return (val >> 10) | 0xc0; } | 1226 | static int tda8425_shift10(int val) { return (val >> 10) | 0xc0; } |
1227 | static int tda8425_shift12(int val) { return (val >> 12) | 0xf0; } | 1227 | static int tda8425_shift12(int val) { return (val >> 12) | 0xf0; } |
1228 | 1228 | ||
1229 | static int tda8425_initialize(struct CHIPSTATE *chip) | ||
1230 | { | ||
1231 | struct CHIPDESC *desc = chip->desc; | ||
1232 | struct i2c_client *c = v4l2_get_subdevdata(&chip->sd); | ||
1233 | int inputmap[4] = { /* tuner */ TDA8425_S1_CH2, /* radio */ TDA8425_S1_CH1, | ||
1234 | /* extern */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF}; | ||
1235 | |||
1236 | if (c->adapter->id == I2C_HW_B_RIVA) | ||
1237 | memcpy(desc->inputmap, inputmap, sizeof(inputmap)); | ||
1238 | return 0; | ||
1239 | } | ||
1240 | |||
1241 | static void tda8425_setmode(struct CHIPSTATE *chip, int mode) | 1229 | static void tda8425_setmode(struct CHIPSTATE *chip, int mode) |
1242 | { | 1230 | { |
1243 | int s1 = chip->shadow.bytes[TDA8425_S1+1] & 0xe1; | 1231 | int s1 = chip->shadow.bytes[TDA8425_S1+1] & 0xe1; |
@@ -1573,7 +1561,6 @@ static struct CHIPDESC chiplist[] = { | |||
1573 | .treblereg = TDA8425_TR, | 1561 | .treblereg = TDA8425_TR, |
1574 | 1562 | ||
1575 | /* callbacks */ | 1563 | /* callbacks */ |
1576 | .initialize = tda8425_initialize, | ||
1577 | .volfunc = tda8425_shift10, | 1564 | .volfunc = tda8425_shift10, |
1578 | .bassfunc = tda8425_shift12, | 1565 | .bassfunc = tda8425_shift12, |
1579 | .treblefunc = tda8425_shift12, | 1566 | .treblefunc = tda8425_shift12, |