diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 20:22:34 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 05:06:00 +0200 |
| commit | 61a489c8ba33c8ef11e3a8b55c22afe834bdf1d4 (patch) | |
| tree | 83bf0790ae9f87e248f5c293fb6594f01d9a8a5b /drivers/media/video/msp3400-driver.c | |
| parent | V4L/DVB: saa7185: remove obsolete v4l2-i2c-drv.h header (diff) | |
| download | linux-61a489c8ba33c8ef11e3a8b55c22afe834bdf1d4.tar.xz linux-61a489c8ba33c8ef11e3a8b55c22afe834bdf1d4.zip | |
V4L/DVB: msp3400: remove obsolete v4l2-i2c-drv.h header
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/msp3400-driver.c')
| -rw-r--r-- | drivers/media/video/msp3400-driver.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 0e412131da7c..fe18a0ab7acb 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c @@ -56,7 +56,6 @@ #include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> -#include <media/v4l2-i2c-drv.h> #include <media/msp3400.h> #include <media/tvaudio.h> #include "msp3400-driver.h" @@ -843,15 +842,31 @@ static const struct i2c_device_id msp_id[] = { }; MODULE_DEVICE_TABLE(i2c, msp_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "msp3400", - .probe = msp_probe, - .remove = msp_remove, - .suspend = msp_suspend, - .resume = msp_resume, - .id_table = msp_id, +static struct i2c_driver msp_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "msp3400", + }, + .probe = msp_probe, + .remove = msp_remove, + .suspend = msp_suspend, + .resume = msp_resume, + .id_table = msp_id, }; +static __init int init_msp(void) +{ + return i2c_add_driver(&msp_driver); +} + +static __exit void exit_msp(void) +{ + i2c_del_driver(&msp_driver); +} + +module_init(init_msp); +module_exit(exit_msp); + /* * Overrides for Emacs so that we follow Linus's tabbing style. * --------------------------------------------------------------------------- |