[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, 10 insertions, 6 deletions

diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 1f4b41599445..659cb8a0b21c 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -69,7 +69,8 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
 #define saa7127_dbg(fmt, arg...) \
         do { \
                 if (debug >= 1) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
@@ -77,15 +78,16 @@ MODULE_PARM_DESC(test_image, "test_image (0-1)");
 #define saa7127_dbg_highvol(fmt, arg...) \
         do { \
                 if (debug == 2) \
-                        printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \
+                        printk(KERN_INFO "%s debug %d-%04x: " fmt, \
+                               client->driver->driver.name, \
                                i2c_adapter_id(client->adapter), client->addr , ## arg); \
         } while (0)
 
 #define saa7127_err(fmt, arg...) do { \
-        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 #define saa7127_info(fmt, arg...) do { \
-        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \
+        printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
                i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
 
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
@@ -818,12 +820,14 @@ static int saa7127_detach(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_saa7127 = {
-        .name = "saa7127",
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "saa7127",
+        },
         .id = I2C_DRIVERID_SAA7127,
         .attach_adapter = saa7127_probe,
         .detach_client = saa7127_detach,
         .command = saa7127_command,
-        .owner = THIS_MODULE,
 };