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

Commit 604f28e2 authored Nov 26, 2005 by Laurent Riffard Committed by Greg Kroah-Hartman Jan 05, 2006

[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>

parent a33ca232

drivers/media/video/adv7170.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -497,8 +497,10 @@ adv7170_detach_client (struct i2c_client *client)
	/* ----------------------------------------------------------------------- */		/* ----------------------------------------------------------------------- */

	static struct i2c_driver i2c_driver_adv7170 = {		static struct i2c_driver i2c_driver_adv7170 = {
			.driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "adv7170", /* name */		.name = "adv7170", /* name */
			},

	.id = I2C_DRIVERID_ADV7170,		.id = I2C_DRIVERID_ADV7170,

drivers/media/video/adv7175.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -547,8 +547,10 @@ adv7175_detach_client (struct i2c_client *client)
	/* ----------------------------------------------------------------------- */		/* ----------------------------------------------------------------------- */

	static struct i2c_driver i2c_driver_adv7175 = {		static struct i2c_driver i2c_driver_adv7175 = {
			.driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "adv7175", /* name */		.name = "adv7175", /* name */
			},

	.id = I2C_DRIVERID_ADV7175,		.id = I2C_DRIVERID_ADV7175,

drivers/media/video/bt819.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -622,8 +622,10 @@ bt819_detach_client (struct i2c_client *client)
	/* ----------------------------------------------------------------------- */		/* ----------------------------------------------------------------------- */

	static struct i2c_driver i2c_driver_bt819 = {		static struct i2c_driver i2c_driver_bt819 = {
			.driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "bt819",		.name = "bt819",
			},

	.id = I2C_DRIVERID_BT819,		.id = I2C_DRIVERID_BT819,

drivers/media/video/bt832.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -230,8 +230,10 @@ bt832_command(struct i2c_client client, unsigned int cmd, void arg)
	/* ----------------------------------------------------------------------- */		/* ----------------------------------------------------------------------- */

	static struct i2c_driver driver = {		static struct i2c_driver driver = {
			.driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "i2c bt832 driver",		.name = "i2c bt832 driver",
			},
	.id = -1, /* FIXME */		.id = -1, /* FIXME */
	.attach_adapter = bt832_probe,		.attach_adapter = bt832_probe,
	.detach_client = bt832_detach,		.detach_client = bt832_detach,

drivers/media/video/bt856.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -404,8 +404,10 @@ bt856_detach_client (struct i2c_client *client)
	/* ----------------------------------------------------------------------- */		/* ----------------------------------------------------------------------- */

	static struct i2c_driver i2c_driver_bt856 = {		static struct i2c_driver i2c_driver_bt856 = {
			.driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "bt856",		.name = "bt856",
			},

	.id = I2C_DRIVERID_BT856,		.id = I2C_DRIVERID_BT856,