V4L/DVB: tvp5150: remove obsolete v4l2-i2c-drv.h header
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 15 Sep 2010 18:45:20 +0000 (15:45 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:06:03 +0000 (01:06 -0200)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/tvp5150.c

index 1654f65cca7c0dfe7c487b12fe32c37711a0b6e3..d62a78688b08add19a76ffa9c9cb34d3b981f312 100644 (file)
@@ -11,7 +11,6 @@
 #include <linux/delay.h>
 #include <media/v4l2-device.h>
 #include <media/tvp5150.h>
-#include <media/v4l2-i2c-drv.h>
 #include <media/v4l2-chip-ident.h>
 
 #include "tvp5150_reg.h"
@@ -1111,9 +1110,25 @@ static const struct i2c_device_id tvp5150_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tvp5150_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "tvp5150",
-       .probe = tvp5150_probe,
-       .remove = tvp5150_remove,
-       .id_table = tvp5150_id,
+static struct i2c_driver tvp5150_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "tvp5150",
+       },
+       .probe          = tvp5150_probe,
+       .remove         = tvp5150_remove,
+       .id_table       = tvp5150_id,
 };
+
+static __init int init_tvp5150(void)
+{
+       return i2c_add_driver(&tvp5150_driver);
+}
+
+static __exit void exit_tvp5150(void)
+{
+       i2c_del_driver(&tvp5150_driver);
+}
+
+module_init(init_tvp5150);
+module_exit(exit_tvp5150);