diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-11-26 14:28:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 01:16:21 -0500 |
commit | 8a9947552d43b0d20d5fa23ac0ba435d526be454 (patch) | |
tree | 086844a62f549e488ebeecc196e1d4726a1d4598 /drivers/macintosh | |
parent | ff179c8cf5caa17bf3d407edbb5872aa2eee6900 (diff) |
[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 <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/therm_adt746x.c | 1 | ||||
-rw-r--r-- | drivers/macintosh/therm_pm72.c | 1 | ||||
-rw-r--r-- | drivers/macintosh/therm_windtunnel.c | 1 | ||||
-rw-r--r-- | drivers/macintosh/windfarm_lm75_sensor.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index f38696622eb4..f62c16fab42b 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
@@ -173,7 +173,6 @@ detach_thermostat(struct i2c_adapter *adapter) | |||
173 | static struct i2c_driver thermostat_driver = { | 173 | static struct i2c_driver thermostat_driver = { |
174 | .owner = THIS_MODULE, | 174 | .owner = THIS_MODULE, |
175 | .name = "therm_adt746x", | 175 | .name = "therm_adt746x", |
176 | .flags = I2C_DF_NOTIFY, | ||
177 | .attach_adapter = attach_thermostat, | 176 | .attach_adapter = attach_thermostat, |
178 | .detach_adapter = detach_thermostat, | 177 | .detach_adapter = detach_thermostat, |
179 | }; | 178 | }; |
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 190878eef990..df00c960fc5a 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -285,7 +285,6 @@ static struct i2c_driver therm_pm72_driver = | |||
285 | { | 285 | { |
286 | .owner = THIS_MODULE, | 286 | .owner = THIS_MODULE, |
287 | .name = "therm_pm72", | 287 | .name = "therm_pm72", |
288 | .flags = I2C_DF_NOTIFY, | ||
289 | .attach_adapter = therm_pm72_attach, | 288 | .attach_adapter = therm_pm72_attach, |
290 | .detach_adapter = therm_pm72_detach, | 289 | .detach_adapter = therm_pm72_detach, |
291 | }; | 290 | }; |
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 6aaa1df1a64e..f3bae0d00ed2 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
@@ -357,7 +357,6 @@ static struct i2c_driver g4fan_driver = { | |||
357 | .owner = THIS_MODULE, | 357 | .owner = THIS_MODULE, |
358 | .name = "therm_windtunnel", | 358 | .name = "therm_windtunnel", |
359 | .id = I2C_DRIVERID_G4FAN, | 359 | .id = I2C_DRIVERID_G4FAN, |
360 | .flags = I2C_DF_NOTIFY, | ||
361 | .attach_adapter = do_attach, | 360 | .attach_adapter = do_attach, |
362 | .detach_client = do_detach, | 361 | .detach_client = do_detach, |
363 | }; | 362 | }; |
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c index a0a41ad0f2b5..2392789ccf32 100644 --- a/drivers/macintosh/windfarm_lm75_sensor.c +++ b/drivers/macintosh/windfarm_lm75_sensor.c | |||
@@ -49,7 +49,6 @@ static int wf_lm75_detach(struct i2c_client *client); | |||
49 | static struct i2c_driver wf_lm75_driver = { | 49 | static struct i2c_driver wf_lm75_driver = { |
50 | .owner = THIS_MODULE, | 50 | .owner = THIS_MODULE, |
51 | .name = "wf_lm75", | 51 | .name = "wf_lm75", |
52 | .flags = I2C_DF_NOTIFY, | ||
53 | .attach_adapter = wf_lm75_attach, | 52 | .attach_adapter = wf_lm75_attach, |
54 | .detach_client = wf_lm75_detach, | 53 | .detach_client = wf_lm75_detach, |
55 | }; | 54 | }; |