diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 22:30:34 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-29 22:30:34 +0200 |
| commit | 6126d94ddc3aa2d314338c11109c97a1be4b22f0 (patch) | |
| tree | a2b412013819c795ee5d0b2780edcf7f8cab3eef /linux/drivers | |
| parent | 5a77a70cc69ef5dc3da63db495a588ec1f3934bc (diff) | |
| download | mediapointer-dvb-s2-6126d94ddc3aa2d314338c11109c97a1be4b22f0.tar.gz mediapointer-dvb-s2-6126d94ddc3aa2d314338c11109c97a1be4b22f0.tar.bz2 | |
msp3400: remove i2c legacy code
From: Hans Verkuil <hverkuil@xs4all.nl>
All drivers that use msp3400 now use v4l2_subdev, so we can remove the
legacy code from msp3400.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index fbe69a62d..d89531433 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -60,7 +60,7 @@ #include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> -#include <media/v4l2-i2c-drv-legacy.h> +#include <media/v4l2-i2c-drv.h> #include <media/msp3400.h> #include <media/tvaudio.h> #include "compat.h" @@ -113,10 +113,12 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing"); /* DSP unit subaddress */ #define I2C_MSP_DSP 0x12 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) /* Addresses to scan */ static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END }; I2C_CLIENT_INSMOD; +#endif /* ----------------------------------------------------------------------- */ /* functions for talking to the MSP3400C Sound processor */ @@ -701,11 +703,6 @@ static int msp_resume(struct i2c_client *client) return 0; } -static int msp_command(struct i2c_client *client, unsigned cmd, void *arg) -{ - return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); -} - /* ----------------------------------------------------------------------- */ static const struct v4l2_subdev_core_ops msp_core_ops = { @@ -945,8 +942,6 @@ MODULE_DEVICE_TABLE(i2c, msp_id); #endif static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "msp3400", - .driverid = I2C_DRIVERID_MSP3400, - .command = msp_command, .probe = msp_probe, .remove = msp_remove, .suspend = msp_suspend, |