Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9718b0c authored by Laurent Riffard's avatar Laurent Riffard Committed by Greg Kroah-Hartman
Browse files

[PATCH] i2c: Drop i2c_driver.{owner,name}, 2 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 miscellaneaous i2c chip 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 35d8b2e6

drivers/i2c/chips/ds1337.c

+4 −2
Original line number Diff line number Diff line
@@ -52,8 +52,10 @@ static int ds1337_command(struct i2c_client *client, unsigned int cmd, 
 * Driver data (common to all clients)

 */

static struct i2c_driver ds1337_driver = {

	.driver = {

		.owner	= THIS_MODULE,

		.name	= "ds1337",

	},

	.attach_adapter	= ds1337_attach_adapter,

	.detach_client	= ds1337_detach_client,

	.command	= ds1337_command,

drivers/i2c/chips/ds1374.c

+4 −2
Original line number Diff line number Diff line
@@ -232,8 +232,10 @@ static int ds1374_detach(struct i2c_client *client) 
}



static struct i2c_driver ds1374_driver = {

	.driver = {

		.owner	= THIS_MODULE,

		.name	= DS1374_DRV_NAME,

	},

	.id = I2C_DRIVERID_DS1374,

	.attach_adapter = ds1374_attach,

	.detach_client = ds1374_detach,

drivers/i2c/chips/eeprom.c

+4 −2
Original line number Diff line number Diff line
@@ -68,8 +68,10 @@ static int eeprom_detach_client(struct i2c_client *client); 


/* This is the driver that will be inserted */

static struct i2c_driver eeprom_driver = {

	.driver = {

		.owner	= THIS_MODULE,

		.name	= "eeprom",

	},

	.id		= I2C_DRIVERID_EEPROM,

	.attach_adapter	= eeprom_attach_adapter,

	.detach_client	= eeprom_detach_client,

drivers/i2c/chips/isp1301_omap.c

+4 −2
Original line number Diff line number Diff line
@@ -1632,8 +1632,10 @@ static int isp1301_scan_bus(struct i2c_adapter *bus) 
}



static struct i2c_driver isp1301_driver = {

	.driver = {

		.owner	= THIS_MODULE,

		.name	= "isp1301_omap",

	},

	.id		= 1301,		/* FIXME "official", i2c-ids.h */

	.class		= I2C_CLASS_HWMON,

	.attach_adapter	= isp1301_scan_bus,

drivers/i2c/chips/m41t00.c

+4 −2
Original line number Diff line number Diff line
@@ -211,8 +211,10 @@ m41t00_detach(struct i2c_client *client) 
}



static struct i2c_driver m41t00_driver = {

	.driver = {

		.owner	= THIS_MODULE,

		.name	= M41T00_DRV_NAME,

	},

	.id		= I2C_DRIVERID_STM41T00,

	.attach_adapter	= m41t00_attach,

	.detach_client	= m41t00_detach,