diff options
| author |   Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 15:36:23 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:06:02 -0200 |
| commit | 02a2098adbe6c1053cbcd81ecb9422f4502da925 (patch) | |
| tree | a3dc8d791bec6c5c167b8021d6cc2b08c6b6fcaf /drivers/media/video/tuner-core.c | |
| parent | V4L/DVB: tlv320aic23b: remove obsolete v4l2-i2c-drv.h header (diff) | |
| download | linux-dev-02a2098adbe6c1053cbcd81ecb9422f4502da925.tar.xz linux-dev-02a2098adbe6c1053cbcd81ecb9422f4502da925.zip | |
V4L/DVB: tuner: 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/tuner-core.c')
| -rw-r--r-- | drivers/media/video/tuner-core.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index c4dab6cfd948..a3bb9e90f1dd 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c @@ -20,7 +20,6 @@ #include <media/tuner-types.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> -#include <media/v4l2-i2c-drv.h> #include "mt20xx.h" #include "tda8290.h" #include "tea5761.h" @@ -1176,16 +1175,32 @@ static const struct i2c_device_id tuner_id[] = { }; MODULE_DEVICE_TABLE(i2c, tuner_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "tuner", - .probe = tuner_probe, - .remove = tuner_remove, - .command = tuner_command, - .suspend = tuner_suspend, - .resume = tuner_resume, - .id_table = tuner_id, +static struct i2c_driver tuner_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "tuner", + }, + .probe = tuner_probe, + .remove = tuner_remove, + .command = tuner_command, + .suspend = tuner_suspend, + .resume = tuner_resume, + .id_table = tuner_id, }; +static __init int init_tuner(void) +{ + return i2c_add_driver(&tuner_driver); +} + +static __exit void exit_tuner(void) +{ + i2c_del_driver(&tuner_driver); +} + +module_init(init_tuner); +module_exit(exit_tuner); + /* * Overrides for Emacs so that we follow Linus's tabbing style. * --------------------------------------------------------------------------- |