From 8a9947552d43b0d20d5fa23ac0ba435d526be454 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 26 Nov 2005 20:28:06 +0100 Subject: [PATCH] i2c: Drop i2c_driver.flags, 2 of 3 Just about every i2c chip driver sets the I2C_DF_NOTIFY flag, so we can simply make it the default and drop the flag. If any driver really doesn't want to be notified when i2c adapters are added, that driver can simply omit to set .attach_adapter. This approach is also more robust as it prevents accidental NULL pointer dereferences. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- sound/ppc/keywest.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sound/ppc/keywest.c') diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index 097fbcfc5d4..fd8e2e6062f 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -43,7 +43,6 @@ static int keywest_detach_client(struct i2c_client *client); struct i2c_driver keywest_driver = { .name = "PMac Keywest Audio", .id = I2C_DRIVERID_KEYWEST, - .flags = I2C_DF_NOTIFY, .attach_adapter = &keywest_attach_adapter, .detach_client = &keywest_detach_client, }; -- cgit v1.2.3 From e100fe103e679372b3d1d6e9d32fd3ab57484be2 Mon Sep 17 00:00:00 2001 From: Laurent Riffard Date: Sat, 26 Nov 2005 20:48:35 +0100 Subject: [PATCH] i2c: Drop i2c_driver.{owner,name}, 7 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 for ppc arch. Signed-off-by: Laurent Riffard Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- sound/ppc/keywest.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sound/ppc/keywest.c') diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index fd8e2e6062f..d532924b5a5 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -41,7 +41,10 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter); static int keywest_detach_client(struct i2c_client *client); struct i2c_driver keywest_driver = { - .name = "PMac Keywest Audio", + .driver = { + .owner = THIS_MODULE, + .name = "PMac Keywest Audio", + }, .id = I2C_DRIVERID_KEYWEST, .attach_adapter = &keywest_attach_adapter, .detach_client = &keywest_detach_client, -- cgit v1.2.3 From 2b48716d1d2f2edb1e7cbc5ecf1cb2cb39373e33 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 6 Dec 2005 15:33:15 -0800 Subject: [PATCH] I2C: Remove .owner setting from i2c_driver as it's no longer needed Now that i2c_add_driver() doesn't need the module owner to be set by hand, we can delete it from the drivers. This patch catches all of the drivers that I found in the current tree (if a driver sets the .owner by hand, it's not a problem, just not needed.) Signed-off-by: Greg Kroah-Hartman Cc: Jean Delvare --- sound/ppc/keywest.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sound/ppc/keywest.c') diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index d532924b5a5..6058c2dd1b7 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -42,7 +42,6 @@ static int keywest_detach_client(struct i2c_client *client); struct i2c_driver keywest_driver = { .driver = { - .owner = THIS_MODULE, .name = "PMac Keywest Audio", }, .id = I2C_DRIVERID_KEYWEST, -- cgit v1.2.3