aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/windfarm_ad7417_sensor.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/macintosh/windfarm_ad7417_sensor.c')
-rw-r--r--drivers/macintosh/windfarm_ad7417_sensor.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/macintosh/windfarm_ad7417_sensor.c b/drivers/macintosh/windfarm_ad7417_sensor.c
index ac3f243b9c5a..7c28b71246c9 100644
--- a/drivers/macintosh/windfarm_ad7417_sensor.c
+++ b/drivers/macintosh/windfarm_ad7417_sensor.c
@@ -177,9 +177,9 @@ static const struct wf_sensor_ops wf_ad7417_adc_ops = {
177 .owner = THIS_MODULE, 177 .owner = THIS_MODULE,
178}; 178};
179 179
180static void __devinit wf_ad7417_add_sensor(struct wf_ad7417_priv *pv, 180static void wf_ad7417_add_sensor(struct wf_ad7417_priv *pv,
181 int index, const char *name, 181 int index, const char *name,
182 const struct wf_sensor_ops *ops) 182 const struct wf_sensor_ops *ops)
183{ 183{
184 pv->sensors[index].name = kasprintf(GFP_KERNEL, "%s-%d", name, pv->cpu); 184 pv->sensors[index].name = kasprintf(GFP_KERNEL, "%s-%d", name, pv->cpu);
185 pv->sensors[index].priv = pv; 185 pv->sensors[index].priv = pv;
@@ -188,7 +188,7 @@ static void __devinit wf_ad7417_add_sensor(struct wf_ad7417_priv *pv,
188 kref_get(&pv->ref); 188 kref_get(&pv->ref);
189} 189}
190 190
191static void __devinit wf_ad7417_init_chip(struct wf_ad7417_priv *pv) 191static void wf_ad7417_init_chip(struct wf_ad7417_priv *pv)
192{ 192{
193 int rc; 193 int rc;
194 u8 buf[2]; 194 u8 buf[2];
@@ -230,8 +230,8 @@ static void __devinit wf_ad7417_init_chip(struct wf_ad7417_priv *pv)
230 pv->config = config; 230 pv->config = config;
231} 231}
232 232
233static int __devinit wf_ad7417_probe(struct i2c_client *client, 233static int wf_ad7417_probe(struct i2c_client *client,
234 const struct i2c_device_id *id) 234 const struct i2c_device_id *id)
235{ 235{
236 struct wf_ad7417_priv *pv; 236 struct wf_ad7417_priv *pv;
237 const struct mpu_data *mpu; 237 const struct mpu_data *mpu;
@@ -290,7 +290,7 @@ static int __devinit wf_ad7417_probe(struct i2c_client *client,
290 return 0; 290 return 0;
291} 291}
292 292
293static int __devexit wf_ad7417_remove(struct i2c_client *client) 293static int wf_ad7417_remove(struct i2c_client *client)
294{ 294{
295 struct wf_ad7417_priv *pv = dev_get_drvdata(&client->dev); 295 struct wf_ad7417_priv *pv = dev_get_drvdata(&client->dev);
296 int i; 296 int i;
@@ -322,7 +322,7 @@ static struct i2c_driver wf_ad7417_driver = {
322 .id_table = wf_ad7417_id, 322 .id_table = wf_ad7417_id,
323}; 323};
324 324
325static int __devinit wf_ad7417_init(void) 325static int wf_ad7417_init(void)
326{ 326{
327 /* This is only supported on these machines */ 327 /* This is only supported on these machines */
328 if (!of_machine_is_compatible("PowerMac7,2") && 328 if (!of_machine_is_compatible("PowerMac7,2") &&
@@ -333,7 +333,7 @@ static int __devinit wf_ad7417_init(void)
333 return i2c_add_driver(&wf_ad7417_driver); 333 return i2c_add_driver(&wf_ad7417_driver);
334} 334}
335 335
336static void __devexit wf_ad7417_exit(void) 336static void wf_ad7417_exit(void)
337{ 337{
338 i2c_del_driver(&wf_ad7417_driver); 338 i2c_del_driver(&wf_ad7417_driver);
339} 339}