V4L/DVB: saa7185: remove obsolete v4l2-i2c-drv.h header

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 77db2039291032a925b2242e96157635db5e28d7..96f56c2f11f347b2f3f4dbb3065bcf3ecde2d256 100644 (file)
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -30,11 +30,9 @@
 #include <linux/ioctl.h>
 #include <asm/uaccess.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/videodev2.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/v4l2-i2c-drv.h>
 
 MODULE_DESCRIPTION("Philips SAA7185 video encoder driver");
 MODULE_AUTHOR("Dave Perks");
@@ -366,9 +364,25 @@ static const struct i2c_device_id saa7185_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, saa7185_id);
 
-static struct v4l2_i2c_driver_data v4l2_i2c_data = {
-       .name = "saa7185",
-       .probe = saa7185_probe,
-       .remove = saa7185_remove,
-       .id_table = saa7185_id,
+static struct i2c_driver saa7185_driver = {
+       .driver = {
+               .owner  = THIS_MODULE,
+               .name   = "saa7185",
+       },
+       .probe          = saa7185_probe,
+       .remove         = saa7185_remove,
+       .id_table       = saa7185_id,
 };
+
+static __init int init_saa7185(void)
+{
+       return i2c_add_driver(&saa7185_driver);
+}
+
+static __exit void exit_saa7185(void)
+{
+       i2c_del_driver(&saa7185_driver);
+}
+
+module_init(init_saa7185);
+module_exit(exit_saa7185);