diff options
| -rw-r--r-- | drivers/macintosh/therm_adt746x.c | 4 | ||||
| -rw-r--r-- | drivers/macintosh/therm_pm72.c | 4 | ||||
| -rw-r--r-- | drivers/macintosh/windfarm_lm75_sensor.c | 4 | ||||
| -rw-r--r-- | drivers/macintosh/windfarm_max6690_sensor.c | 4 | ||||
| -rw-r--r-- | drivers/macintosh/windfarm_smu_sat.c | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c index fde377c60cca..556f0feaa4df 100644 --- a/drivers/macintosh/therm_adt746x.c +++ b/drivers/macintosh/therm_adt746x.c | |||
| @@ -124,6 +124,8 @@ read_reg(struct thermostat* th, int reg) | |||
| 124 | return data; | 124 | return data; |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | static struct i2c_driver thermostat_driver; | ||
| 128 | |||
| 127 | static int | 129 | static int |
| 128 | attach_thermostat(struct i2c_adapter *adapter) | 130 | attach_thermostat(struct i2c_adapter *adapter) |
| 129 | { | 131 | { |
| @@ -148,7 +150,7 @@ attach_thermostat(struct i2c_adapter *adapter) | |||
| 148 | * Let i2c-core delete that device on driver removal. | 150 | * Let i2c-core delete that device on driver removal. |
| 149 | * This is safe because i2c-core holds the core_lock mutex for us. | 151 | * This is safe because i2c-core holds the core_lock mutex for us. |
| 150 | */ | 152 | */ |
| 151 | list_add_tail(&client->detected, &client->driver->clients); | 153 | list_add_tail(&client->detected, &thermostat_driver.clients); |
| 152 | return 0; | 154 | return 0; |
| 153 | } | 155 | } |
| 154 | 156 | ||
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index a028598af2d3..ea32c7e5a9af 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
| @@ -286,6 +286,8 @@ struct fcu_fan_table fcu_fans[] = { | |||
| 286 | }, | 286 | }, |
| 287 | }; | 287 | }; |
| 288 | 288 | ||
| 289 | static struct i2c_driver therm_pm72_driver; | ||
| 290 | |||
| 289 | /* | 291 | /* |
| 290 | * Utility function to create an i2c_client structure and | 292 | * Utility function to create an i2c_client structure and |
| 291 | * attach it to one of u3 adapters | 293 | * attach it to one of u3 adapters |
| @@ -318,7 +320,7 @@ static struct i2c_client *attach_i2c_chip(int id, const char *name) | |||
| 318 | * Let i2c-core delete that device on driver removal. | 320 | * Let i2c-core delete that device on driver removal. |
| 319 | * This is safe because i2c-core holds the core_lock mutex for us. | 321 | * This is safe because i2c-core holds the core_lock mutex for us. |
| 320 | */ | 322 | */ |
| 321 | list_add_tail(&clt->detected, &clt->driver->clients); | 323 | list_add_tail(&clt->detected, &therm_pm72_driver.clients); |
| 322 | return clt; | 324 | return clt; |
| 323 | } | 325 | } |
| 324 | 326 | ||
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c index 529886c7a826..ed6426a10773 100644 --- a/drivers/macintosh/windfarm_lm75_sensor.c +++ b/drivers/macintosh/windfarm_lm75_sensor.c | |||
| @@ -115,6 +115,8 @@ static int wf_lm75_probe(struct i2c_client *client, | |||
| 115 | return rc; | 115 | return rc; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 118 | static struct i2c_driver wf_lm75_driver; | ||
| 119 | |||
| 118 | static struct i2c_client *wf_lm75_create(struct i2c_adapter *adapter, | 120 | static struct i2c_client *wf_lm75_create(struct i2c_adapter *adapter, |
| 119 | u8 addr, int ds1775, | 121 | u8 addr, int ds1775, |
| 120 | const char *loc) | 122 | const char *loc) |
| @@ -157,7 +159,7 @@ static struct i2c_client *wf_lm75_create(struct i2c_adapter *adapter, | |||
| 157 | * Let i2c-core delete that device on driver removal. | 159 | * Let i2c-core delete that device on driver removal. |
| 158 | * This is safe because i2c-core holds the core_lock mutex for us. | 160 | * This is safe because i2c-core holds the core_lock mutex for us. |
| 159 | */ | 161 | */ |
| 160 | list_add_tail(&client->detected, &client->driver->clients); | 162 | list_add_tail(&client->detected, &wf_lm75_driver.clients); |
| 161 | return client; | 163 | return client; |
| 162 | fail: | 164 | fail: |
| 163 | return NULL; | 165 | return NULL; |
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c index e2a55ecda2b2..a67b349319e9 100644 --- a/drivers/macintosh/windfarm_max6690_sensor.c +++ b/drivers/macintosh/windfarm_max6690_sensor.c | |||
| @@ -88,6 +88,8 @@ static int wf_max6690_probe(struct i2c_client *client, | |||
| 88 | return rc; | 88 | return rc; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | static struct i2c_driver wf_max6690_driver; | ||
| 92 | |||
| 91 | static struct i2c_client *wf_max6690_create(struct i2c_adapter *adapter, | 93 | static struct i2c_client *wf_max6690_create(struct i2c_adapter *adapter, |
| 92 | u8 addr, const char *loc) | 94 | u8 addr, const char *loc) |
| 93 | { | 95 | { |
| @@ -119,7 +121,7 @@ static struct i2c_client *wf_max6690_create(struct i2c_adapter *adapter, | |||
| 119 | * Let i2c-core delete that device on driver removal. | 121 | * Let i2c-core delete that device on driver removal. |
| 120 | * This is safe because i2c-core holds the core_lock mutex for us. | 122 | * This is safe because i2c-core holds the core_lock mutex for us. |
| 121 | */ | 123 | */ |
| 122 | list_add_tail(&client->detected, &client->driver->clients); | 124 | list_add_tail(&client->detected, &wf_max6690_driver.clients); |
| 123 | return client; | 125 | return client; |
| 124 | 126 | ||
| 125 | fail: | 127 | fail: |
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c index 5da729e58f99..e20330a28959 100644 --- a/drivers/macintosh/windfarm_smu_sat.c +++ b/drivers/macintosh/windfarm_smu_sat.c | |||
| @@ -194,6 +194,8 @@ static struct wf_sensor_ops wf_sat_ops = { | |||
| 194 | .owner = THIS_MODULE, | 194 | .owner = THIS_MODULE, |
| 195 | }; | 195 | }; |
| 196 | 196 | ||
| 197 | static struct i2c_driver wf_sat_driver; | ||
| 198 | |||
| 197 | static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev) | 199 | static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev) |
| 198 | { | 200 | { |
| 199 | struct i2c_board_info info; | 201 | struct i2c_board_info info; |
| @@ -222,7 +224,7 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev) | |||
| 222 | * Let i2c-core delete that device on driver removal. | 224 | * Let i2c-core delete that device on driver removal. |
| 223 | * This is safe because i2c-core holds the core_lock mutex for us. | 225 | * This is safe because i2c-core holds the core_lock mutex for us. |
| 224 | */ | 226 | */ |
| 225 | list_add_tail(&client->detected, &client->driver->clients); | 227 | list_add_tail(&client->detected, &wf_sat_driver.clients); |
| 226 | } | 228 | } |
| 227 | 229 | ||
| 228 | static int wf_sat_probe(struct i2c_client *client, | 230 | static int wf_sat_probe(struct i2c_client *client, |
