Commit 604f28e2 authored by Laurent Riffard's avatar Laurent Riffard Committed by Greg Kroah-Hartman

[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: default avatarLaurent Riffard <laurent.riffard@free.fr>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a33ca232
......@@ -497,8 +497,10 @@ adv7170_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_adv7170 = {
.owner = THIS_MODULE,
.name = "adv7170", /* name */
.driver = {
.owner = THIS_MODULE,
.name = "adv7170", /* name */
},
.id = I2C_DRIVERID_ADV7170,
......
......@@ -547,8 +547,10 @@ adv7175_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_adv7175 = {
.owner = THIS_MODULE,
.name = "adv7175", /* name */
.driver = {
.owner = THIS_MODULE,
.name = "adv7175", /* name */
},
.id = I2C_DRIVERID_ADV7175,
......
......@@ -622,8 +622,10 @@ bt819_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_bt819 = {
.owner = THIS_MODULE,
.name = "bt819",
.driver = {
.owner = THIS_MODULE,
.name = "bt819",
},
.id = I2C_DRIVERID_BT819,
......
......@@ -230,8 +230,10 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
/* ----------------------------------------------------------------------- */
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "i2c bt832 driver",
.driver = {
.owner = THIS_MODULE,
.name = "i2c bt832 driver",
},
.id = -1, /* FIXME */
.attach_adapter = bt832_probe,
.detach_client = bt832_detach,
......
......@@ -404,8 +404,10 @@ bt856_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_bt856 = {
.owner = THIS_MODULE,
.name = "bt856",
.driver = {
.owner = THIS_MODULE,
.name = "bt856",
},
.id = I2C_DRIVERID_BT856,
......
......@@ -300,7 +300,7 @@ static int attach_inform(struct i2c_client *client)
if (bttv_debug)
printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
btv->c.nr,client->driver->name,client->addr,
btv->c.nr, client->driver->driver.name, client->addr,
client->name);
if (!client->driver->command)
return 0;
......
......@@ -42,15 +42,16 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
#define cs53l32a_dbg(fmt, arg...) \
do { \
if (debug) \
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 cs53l32a_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 cs53l32a_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[] = { 0x22 >> 1, I2C_CLIENT_END };
......@@ -215,12 +216,14 @@ static int cs53l32a_detach(struct i2c_client *client)
/* i2c implementation */
static struct i2c_driver i2c_driver = {
.name = "cs53l32a",
.driver = {
.owner = THIS_MODULE,
.name = "cs53l32a",
},
.id = I2C_DRIVERID_CS53L32A,
.attach_adapter = cs53l32a_probe,
.detach_client = cs53l32a_detach,
.command = cs53l32a_command,
.owner = THIS_MODULE,
};
......
......@@ -843,14 +843,16 @@ static int cx25840_detach_client(struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_cx25840 = {
.name = "cx25840",
.driver = {
.owner = THIS_MODULE,
.name = "cx25840",
},
.id = I2C_DRIVERID_CX25840,
.attach_adapter = cx25840_attach_adapter,
.detach_client = cx25840_detach_client,
.command = cx25840_command,
.owner = THIS_MODULE,
};
......
......@@ -27,15 +27,16 @@
extern int cx25840_debug;
#define cx25840_dbg(fmt, arg...) do { if (cx25840_debug) \
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 cx25840_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 cx25840_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)
#define CX25840_CID_CARDTYPE (V4L2_CID_PRIVATE_BASE+0)
......
......@@ -94,7 +94,7 @@ static int attach_inform(struct i2c_client *client)
struct cx88_core *core = i2c_get_adapdata(client->adapter);
dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n",
client->driver->name, client->addr, client->name);
client->driver->driver.name, client->addr, client->name);
if (!client->driver->command)
return 0;
......
......@@ -451,8 +451,10 @@ static int indycam_command(struct i2c_client *client, unsigned int cmd,
}
static struct i2c_driver i2c_driver_indycam = {
.owner = THIS_MODULE,
.name = "indycam",
.driver = {
.owner = THIS_MODULE,
.name = "indycam",
},
.id = I2C_DRIVERID_INDYCAM,
.attach_adapter = indycam_probe,
.detach_client = indycam_detach,
......
......@@ -278,7 +278,10 @@ static int ir_detach(struct i2c_client *client);
static int ir_probe(struct i2c_adapter *adap);
static struct i2c_driver driver = {
.name = "ir remote kbd driver",
.driver = {
.owner = THIS_MODULE,
.name = "ir remote kbd driver",
},
.id = I2C_DRIVERID_INFRARED,
.attach_adapter = ir_probe,
.detach_client = ir_detach,
......
......@@ -59,7 +59,8 @@
#define msp3400_dbg(fmt, arg...) \
do { \
if (debug) \
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)
......@@ -67,7 +68,8 @@
#define msp3400_dbg_mediumvol(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)
......@@ -75,18 +77,19 @@
#define msp3400_dbg_highvol(fmt, arg...) \
do { \
if (debug >= 16) \
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 msp3400_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 msp3400_warn(fmt, arg...) do { \
printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->name, \
printk(KERN_WARNING "%s %d-%04x: " fmt, client->driver->driver.name, \
i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
#define msp3400_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)
#define OPMODE_AUTO -1
......@@ -1561,13 +1564,13 @@ static int msp_resume(struct device * dev);
static void msp_wake_thread(struct i2c_client *client);
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "msp3400",
.id = I2C_DRIVERID_MSP3400,
.attach_adapter = msp_probe,
.detach_client = msp_detach,
.command = msp_command,
.driver = {
.owner = THIS_MODULE,
.name = "i2c msp3400 driver",
.suspend = msp_suspend,
.resume = msp_resume,
},
......
......@@ -410,8 +410,10 @@ static int ovcamchip_command(struct i2c_client *c, unsigned int cmd, void *arg)
/* ----------------------------------------------------------------------- */
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "ovcamchip",
.driver = {
.owner = THIS_MODULE,
.name = "ovcamchip",
},
.id = I2C_DRIVERID_OVCAMCHIP,
.class = I2C_CLASS_CAM_DIGITAL,
.attach_adapter = ovcamchip_attach,
......
......@@ -163,8 +163,10 @@ static int saa5246a_command(struct i2c_client *device, unsigned int cmd,
static struct i2c_driver i2c_driver_videotext =
{
.owner = THIS_MODULE,
.name = IF_NAME, /* name */
.driver = {
.owner = THIS_MODULE,
.name = IF_NAME, /* name */
},
.id = I2C_DRIVERID_SAA5249, /* in i2c.h */
.attach_adapter = saa5246a_probe,
.detach_client = saa5246a_detach,
......
......@@ -236,8 +236,10 @@ static int saa5249_command(struct i2c_client *device,
static struct i2c_driver i2c_driver_videotext =
{
.owner = THIS_MODULE,
.name = IF_NAME, /* name */
.driver = {
.owner = THIS_MODULE,
.name = IF_NAME, /* name */
},
.id = I2C_DRIVERID_SAA5249, /* in i2c.h */
.attach_adapter = saa5249_probe,
.detach_client = saa5249_detach,
......
......@@ -495,8 +495,10 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
/* ----------------------------------------------------------------------- */
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "i2c saa6588 driver",
.driver = {
.owner = THIS_MODULE,
.name = "i2c saa6588 driver",
},
.id = -1, /* FIXME */
.attach_adapter = saa6588_probe,
.detach_client = saa6588_detach,
......
......@@ -586,8 +586,10 @@ saa7110_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_saa7110 = {
.owner = THIS_MODULE,
.name = "saa7110",
.driver = {
.owner = THIS_MODULE,
.name = "saa7110",
},
.id = I2C_DRIVERID_SAA7110,
......
......@@ -589,8 +589,10 @@ saa7111_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_saa7111 = {
.owner = THIS_MODULE,
.name = "saa7111",
.driver = {
.owner = THIS_MODULE,
.name = "saa7111",
},
.id = I2C_DRIVERID_SAA7111A,
......
......@@ -1203,8 +1203,10 @@ saa7114_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_saa7114 = {
.owner = THIS_MODULE,
.name = "saa7114",
.driver = {
.owner = THIS_MODULE,
.name = "saa7114",
},
.id = I2C_DRIVERID_SAA7114,
......
......@@ -52,15 +52,16 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
#define saa7115_dbg(fmt,arg...) \
do { \
if (debug) \
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 saa7115_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 saa7115_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[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END };
......@@ -1353,12 +1354,14 @@ static int saa7115_detach(struct i2c_client *client)
/* i2c implementation */
static struct i2c_driver i2c_driver_saa7115 = {
.name = "saa7115",
.driver = {
.owner = THIS_MODULE,
.name = "saa7115",
},
.id = I2C_DRIVERID_SAA711X,
.attach_adapter = saa7115_probe,
.detach_client = saa7115_detach,
.command = saa7115_command,
.owner = THIS_MODULE,
};
......
......@@ -564,8 +564,10 @@ saa711x_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_saa711x = {
.owner = THIS_MODULE,
.name = "saa711x",
.driver = {
.owner = THIS_MODULE,
.name = "saa711x",
},
.id = I2C_DRIVERID_SAA711X,
......
......@@ -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,
};
......
......@@ -597,8 +597,10 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
/* ----------------------------------------------------------------------- */
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "i2c saa6752hs MPEG encoder",
.driver = {
.owner = THIS_MODULE,
.name = "i2c saa6752hs MPEG encoder",
},
.id = I2C_DRIVERID_SAA6752HS,
.attach_adapter = saa6752hs_probe,
.detach_client = saa6752hs_detach,
......
......@@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client)
struct tuner_setup tun_setup;
d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
client->driver->name, client->addr, client->name);
client->driver->driver.name, client->addr, client->name);
/* Am I an i2c remote control? */
......@@ -343,7 +343,7 @@ static int attach_inform(struct i2c_client *client)
{
struct IR_i2c *ir = i2c_get_clientdata(client);
d1printk("%s i2c IR detected (%s).\n",
client->driver->name,ir->phys);
client->driver->driver.name, ir->phys);
saa7134_set_i2c_ir(dev,ir);
break;
}
......
......@@ -486,8 +486,10 @@ saa7185_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_saa7185 = {
.owner = THIS_MODULE,
.name = "saa7185", /* name */
.driver = {
.owner = THIS_MODULE,
.name = "saa7185", /* name */
},
.id = I2C_DRIVERID_SAA7185B,
......
......@@ -788,8 +788,10 @@ static int saa7191_command(struct i2c_client *client, unsigned int cmd,
}
static struct i2c_driver i2c_driver_saa7191 = {
.owner = THIS_MODULE,
.name = "saa7191",
.driver = {
.owner = THIS_MODULE,
.name = "saa7191",
},
.id = I2C_DRIVERID_SAA7191,
.attach_adapter = saa7191_probe,
.detach_client = saa7191_detach,
......
......@@ -501,8 +501,10 @@ static int tda7432_command(struct i2c_client *client,
}
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "i2c tda7432 driver",
.driver = {
.owner = THIS_MODULE,
.name = "i2c tda7432 driver",
},
.id = I2C_DRIVERID_TDA7432,
.attach_adapter = tda7432_probe,
.detach_client = tda7432_detach,
......
......@@ -221,8 +221,10 @@ static int detach(struct i2c_client *client)
}
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "tda9840",
.driver = {
.owner = THIS_MODULE,
.name = "tda9840",
},
.id = I2C_DRIVERID_TDA9840,
.attach_adapter = attach,
.detach_client = detach,
......
......@@ -372,8 +372,10 @@ static int tda9875_command(struct i2c_client *client,
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "i2c tda9875 driver",
.driver = {
.owner = THIS_MODULE,
.name = "i2c tda9875 driver",
},
.id = I2C_DRIVERID_TDA9875,
.attach_adapter = tda9875_probe,
.detach_client = tda9875_detach,
......
......@@ -819,13 +819,13 @@ static int tda9887_resume(struct device * dev)
/* ----------------------------------------------------------------------- */
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "i2c tda9887 driver",
.id = -1, /* FIXME */
.attach_adapter = tda9887_probe,
.detach_client = tda9887_detach,
.command = tda9887_command,
.driver = {
.owner = THIS_MODULE,
.name = "i2c tda9887 driver",
.suspend = tda9887_suspend,
.resume = tda9887_resume,
},
......
......@@ -190,8 +190,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
}
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "tea6415c",
.driver = {
.owner = THIS_MODULE,
.name = "tea6415c",
},
.id = I2C_DRIVERID_TEA6415C,
.attach_adapter = attach,
.detach_client = detach,
......
......@@ -167,8 +167,10 @@ static int command(struct i2c_client *client, unsigned int cmd, void *arg)
}
static struct i2c_driver driver = {
.owner = THIS_MODULE,
.name = "tea6420",
.driver = {
.owner = THIS_MODULE,
.name = "tea6420",
},
.id = I2C_DRIVERID_TEA6420,
.attach_adapter = attach,
.detach_client = detach,
......
......@@ -175,8 +175,10 @@ tuner_probe(struct i2c_adapter *adap)
static struct i2c_driver
i2c_driver_tuner =
{
.owner = THIS_MODULE,
.name = "sab3036",
.driver = {
.owner = THIS_MODULE,
.name = "sab3036",
},
.id = I2C_DRIVERID_SAB3036,
.attach_adapter = tuner_probe,
.detach_client = tuner_detach,
......