[PATCH] i2c: Drop i2c_driver.{owner,name}, 5 of 11

We should use the i2c_driver.driver's .name and .owner fields
instead of the i2c_driver's ones.

This patch updates the drivers/media/video and usb/media drivers.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 936e01d2c785..5f4d01854767 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,9 +228,13 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
-        .owner           = THIS_MODULE,
-#endif
+        .driver = {
+                .owner   = THIS_MODULE,
+                .name    = "tv card mixer driver",
+        },
+#else
         .name            = "tv card mixer driver",
+#endif
         .id              = I2C_DRIVERID_TVMIXER,
         .detach_adapter  = tvmixer_adapters,
         .attach_adapter  = tvmixer_adapters,