aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25840
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 07:55:46 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:43:48 -0400
commitb6198ade556add7a6f1dd1d38dd489b0484cab2d (patch)
treea51dd0ffcbddf922d3da3d1e25d788e2f79a6312 /drivers/media/video/cx25840
parent0d5a19f15837de69f864b2a43a93f119224d778c (diff)
V4L/DVB (11298): cx25840: remove legacy code for old-style i2c API
All drivers that use cx25840 are now converted to v4l2_subdev, so I can remove the support for the old-style i2c API. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx25840')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 4a5d5ef9dfc7..a9b8e520ae57 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -39,7 +39,7 @@
39#include <linux/delay.h> 39#include <linux/delay.h>
40#include <media/v4l2-common.h> 40#include <media/v4l2-common.h>
41#include <media/v4l2-chip-ident.h> 41#include <media/v4l2-chip-ident.h>
42#include <media/v4l2-i2c-drv-legacy.h> 42#include <media/v4l2-i2c-drv.h>
43#include <media/cx25840.h> 43#include <media/cx25840.h>
44 44
45#include "cx25840-core.h" 45#include "cx25840-core.h"
@@ -48,15 +48,12 @@ MODULE_DESCRIPTION("Conexant CX25840 audio/video decoder driver");
48MODULE_AUTHOR("Ulf Eklund, Chris Kennedy, Hans Verkuil, Tyler Trafford"); 48MODULE_AUTHOR("Ulf Eklund, Chris Kennedy, Hans Verkuil, Tyler Trafford");
49MODULE_LICENSE("GPL"); 49MODULE_LICENSE("GPL");
50 50
51static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
52
53static int cx25840_debug; 51static int cx25840_debug;
54 52
55module_param_named(debug,cx25840_debug, int, 0644); 53module_param_named(debug,cx25840_debug, int, 0644);
56 54
57MODULE_PARM_DESC(debug, "Debugging messages [0=Off (default) 1=On]"); 55MODULE_PARM_DESC(debug, "Debugging messages [0=Off (default) 1=On]");
58 56
59I2C_CLIENT_INSMOD;
60 57
61/* ----------------------------------------------------------------------- */ 58/* ----------------------------------------------------------------------- */
62 59
@@ -1393,19 +1390,6 @@ static int cx25840_log_status(struct v4l2_subdev *sd)
1393 return 0; 1390 return 0;
1394} 1391}
1395 1392
1396static int cx25840_command(struct i2c_client *client, unsigned cmd, void *arg)
1397{
1398 /* ignore this command */
1399 if (cmd == TUNER_SET_TYPE_ADDR || cmd == TUNER_SET_CONFIG)
1400 return 0;
1401
1402 /* Old-style drivers rely on initialization on first use, so
1403 call the init whenever a command is issued to this driver.
1404 New-style drivers using v4l2_subdev should call init explicitly. */
1405 cx25840_init(i2c_get_clientdata(client), 0);
1406 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
1407}
1408
1409/* ----------------------------------------------------------------------- */ 1393/* ----------------------------------------------------------------------- */
1410 1394
1411static const struct v4l2_subdev_core_ops cx25840_core_ops = { 1395static const struct v4l2_subdev_core_ops cx25840_core_ops = {
@@ -1541,8 +1525,6 @@ MODULE_DEVICE_TABLE(i2c, cx25840_id);
1541 1525
1542static struct v4l2_i2c_driver_data v4l2_i2c_data = { 1526static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1543 .name = "cx25840", 1527 .name = "cx25840",
1544 .driverid = I2C_DRIVERID_CX25840,
1545 .command = cx25840_command,
1546 .probe = cx25840_probe, 1528 .probe = cx25840_probe,
1547 .remove = cx25840_remove, 1529 .remove = cx25840_remove,
1548 .id_table = cx25840_id, 1530 .id_table = cx25840_id,