From cb595b516030bb0c356386e6c8de8569f1966e5b Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 15 Sep 2010 15:06:40 -0300 Subject: [PATCH] V4L/DVB: tda9840: remove obsolete v4l2-i2c-drv.h header Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/tda9840.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c index 92d22d8..5d4cf3b 100644 --- a/drivers/media/video/tda9840.c +++ b/drivers/media/video/tda9840.c @@ -32,7 +32,6 @@ #include #include #include -#include MODULE_AUTHOR("Michael Hunold "); MODULE_DESCRIPTION("tda9840 driver"); @@ -199,9 +198,25 @@ static const struct i2c_device_id tda9840_id[] = { }; MODULE_DEVICE_TABLE(i2c, tda9840_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "tda9840", - .probe = tda9840_probe, - .remove = tda9840_remove, - .id_table = tda9840_id, +static struct i2c_driver tda9840_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "tda9840", + }, + .probe = tda9840_probe, + .remove = tda9840_remove, + .id_table = tda9840_id, }; + +static __init int init_tda9840(void) +{ + return i2c_add_driver(&tda9840_driver); +} + +static __exit void exit_tda9840(void) +{ + i2c_del_driver(&tda9840_driver); +} + +module_init(init_tda9840); +module_exit(exit_tda9840); -- 2.7.4