aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/max8660.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-02-24 02:38:28 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-03-03 09:49:29 -0500
commit308f100f2ef8e8b9f65b0f3c2a1c7044ec0e65a5 (patch)
tree96169485cb75de91bc7d17fc334663267b4fb16d /drivers/regulator/max8660.c
parentbd88c9b285b76f329243d5c80960c23a04004043 (diff)
Regulators: max8660 - annotate probe and remove methods
Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator/max8660.c')
-rw-r--r--drivers/regulator/max8660.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index acc2fb7b6087..f12f1bb62138 100644
--- a/drivers/regulator/max8660.c
+++ b/drivers/regulator/max8660.c
@@ -345,8 +345,8 @@ static struct regulator_desc max8660_reg[] = {
345 }, 345 },
346}; 346};
347 347
348static int max8660_probe(struct i2c_client *client, 348static int __devinit max8660_probe(struct i2c_client *client,
349 const struct i2c_device_id *i2c_id) 349 const struct i2c_device_id *i2c_id)
350{ 350{
351 struct regulator_dev **rdev; 351 struct regulator_dev **rdev;
352 struct max8660_platform_data *pdata = client->dev.platform_data; 352 struct max8660_platform_data *pdata = client->dev.platform_data;
@@ -354,7 +354,7 @@ static int max8660_probe(struct i2c_client *client,
354 int boot_on, i, id, ret = -EINVAL; 354 int boot_on, i, id, ret = -EINVAL;
355 355
356 if (pdata->num_subdevs > MAX8660_V_END) { 356 if (pdata->num_subdevs > MAX8660_V_END) {
357 dev_err(&client->dev, "Too much regulators found!\n"); 357 dev_err(&client->dev, "Too many regulators found!\n");
358 goto out; 358 goto out;
359 } 359 }
360 360
@@ -462,7 +462,7 @@ out:
462 return ret; 462 return ret;
463} 463}
464 464
465static int max8660_remove(struct i2c_client *client) 465static int __devexit max8660_remove(struct i2c_client *client)
466{ 466{
467 struct regulator_dev **rdev = i2c_get_clientdata(client); 467 struct regulator_dev **rdev = i2c_get_clientdata(client);
468 int i; 468 int i;
@@ -485,9 +485,10 @@ MODULE_DEVICE_TABLE(i2c, max8660_id);
485 485
486static struct i2c_driver max8660_driver = { 486static struct i2c_driver max8660_driver = {
487 .probe = max8660_probe, 487 .probe = max8660_probe,
488 .remove = max8660_remove, 488 .remove = __devexit_p(max8660_remove),
489 .driver = { 489 .driver = {
490 .name = "max8660", 490 .name = "max8660",
491 .owner = THIS_MODULE,
491 }, 492 },
492 .id_table = max8660_id, 493 .id_table = max8660_id,
493}; 494};