aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 08:06:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:49 -0400
commit267ea2a9dc53eba8a314db74c169223d7c775145 (patch)
tree90075506250fbf12694fe46da48639fb6fb8a742
parenta61389134c7c69a63ce779e40f6a052f7b3a17fd (diff)
V4L/DVB (11303): tda7432: remove legacy code for old-style i2c API
tda7432 is no longer used with the old-style i2c API, so I can remove the support for that. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/tda7432.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 976ce207cfcb..005f8a468031 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -50,7 +50,7 @@
50#include <media/v4l2-device.h> 50#include <media/v4l2-device.h>
51#include <media/v4l2-ioctl.h> 51#include <media/v4l2-ioctl.h>
52#include <media/i2c-addr.h> 52#include <media/i2c-addr.h>
53#include <media/v4l2-i2c-drv-legacy.h> 53#include <media/v4l2-i2c-drv.h>
54 54
55#ifndef VIDEO_AUDIO_BALANCE 55#ifndef VIDEO_AUDIO_BALANCE
56# define VIDEO_AUDIO_BALANCE 32 56# define VIDEO_AUDIO_BALANCE 32
@@ -69,13 +69,6 @@ MODULE_PARM_DESC(maxvol,"Set maximium volume to +20db (0), default is 0db(1)");
69module_param(maxvol, int, S_IRUGO | S_IWUSR); 69module_param(maxvol, int, S_IRUGO | S_IWUSR);
70 70
71 71
72/* Address to scan (I2C address of this chip) */
73static unsigned short normal_i2c[] = {
74 I2C_ADDR_TDA7432 >> 1,
75 I2C_CLIENT_END,
76};
77
78I2C_CLIENT_INSMOD;
79 72
80/* Structure of address and subaddresses for the tda7432 */ 73/* Structure of address and subaddresses for the tda7432 */
81 74
@@ -433,11 +426,6 @@ static int tda7432_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc)
433 return -EINVAL; 426 return -EINVAL;
434} 427}
435 428
436static int tda7432_command(struct i2c_client *client, unsigned cmd, void *arg)
437{
438 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
439}
440
441/* ----------------------------------------------------------------------- */ 429/* ----------------------------------------------------------------------- */
442 430
443static const struct v4l2_subdev_core_ops tda7432_core_ops = { 431static const struct v4l2_subdev_core_ops tda7432_core_ops = {
@@ -500,7 +488,6 @@ MODULE_DEVICE_TABLE(i2c, tda7432_id);
500 488
501static struct v4l2_i2c_driver_data v4l2_i2c_data = { 489static struct v4l2_i2c_driver_data v4l2_i2c_data = {
502 .name = "tda7432", 490 .name = "tda7432",
503 .command = tda7432_command,
504 .probe = tda7432_probe, 491 .probe = tda7432_probe,
505 .remove = tda7432_remove, 492 .remove = tda7432_remove,
506 .id_table = tda7432_id, 493 .id_table = tda7432_id,