aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 16:30:34 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:16 -0400
commit46e226742618cf3e33635536decdffd48f3f0ebe (patch)
tree703f02128eba8300ddcef02b8220e83a0bfe081b
parent36fa674e6ca918fccc95ce8dbb16a8e68c0c1ef3 (diff)
V4L/DVB (11361): msp3400: remove i2c legacy code
All drivers that use msp3400 now use v4l2_subdev, so we can remove the legacy code from msp3400. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/msp3400-driver.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index 9e8e06cfe5c6..aeab597a0406 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -56,7 +56,7 @@
56#include <linux/videodev2.h> 56#include <linux/videodev2.h>
57#include <media/v4l2-device.h> 57#include <media/v4l2-device.h>
58#include <media/v4l2-ioctl.h> 58#include <media/v4l2-ioctl.h>
59#include <media/v4l2-i2c-drv-legacy.h> 59#include <media/v4l2-i2c-drv.h>
60#include <media/msp3400.h> 60#include <media/msp3400.h>
61#include <media/tvaudio.h> 61#include <media/tvaudio.h>
62#include "msp3400-driver.h" 62#include "msp3400-driver.h"
@@ -108,10 +108,6 @@ MODULE_PARM_DESC(dolby, "Activates Dolby processsing");
108/* DSP unit subaddress */ 108/* DSP unit subaddress */
109#define I2C_MSP_DSP 0x12 109#define I2C_MSP_DSP 0x12
110 110
111/* Addresses to scan */
112static unsigned short normal_i2c[] = { 0x80 >> 1, 0x88 >> 1, I2C_CLIENT_END };
113
114I2C_CLIENT_INSMOD;
115 111
116/* ----------------------------------------------------------------------- */ 112/* ----------------------------------------------------------------------- */
117/* functions for talking to the MSP3400C Sound processor */ 113/* functions for talking to the MSP3400C Sound processor */
@@ -696,11 +692,6 @@ static int msp_resume(struct i2c_client *client)
696 return 0; 692 return 0;
697} 693}
698 694
699static int msp_command(struct i2c_client *client, unsigned cmd, void *arg)
700{
701 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
702}
703
704/* ----------------------------------------------------------------------- */ 695/* ----------------------------------------------------------------------- */
705 696
706static const struct v4l2_subdev_core_ops msp_core_ops = { 697static const struct v4l2_subdev_core_ops msp_core_ops = {
@@ -925,8 +916,6 @@ MODULE_DEVICE_TABLE(i2c, msp_id);
925 916
926static struct v4l2_i2c_driver_data v4l2_i2c_data = { 917static struct v4l2_i2c_driver_data v4l2_i2c_data = {
927 .name = "msp3400", 918 .name = "msp3400",
928 .driverid = I2C_DRIVERID_MSP3400,
929 .command = msp_command,
930 .probe = msp_probe, 919 .probe = msp_probe,
931 .remove = msp_remove, 920 .remove = msp_remove,
932 .suspend = msp_suspend, 921 .suspend = msp_suspend,