diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-02-24 02:38:23 -0500 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-03-03 09:49:28 -0500 |
commit | bd88c9b285b76f329243d5c80960c23a04004043 (patch) | |
tree | c6531b45ed4b2342eb269adf30e0073a9ab8fc21 /drivers/regulator | |
parent | ebbed04fe7f89c9cb00df32f7123bc1b84b456cb (diff) |
Regulators: max1586 - 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')
-rw-r--r-- | drivers/regulator/max1586.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index 2c082d3ef484..a49fc952c9a9 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
@@ -179,8 +179,8 @@ static struct regulator_desc max1586_reg[] = { | |||
179 | }, | 179 | }, |
180 | }; | 180 | }; |
181 | 181 | ||
182 | static int max1586_pmic_probe(struct i2c_client *client, | 182 | static int __devinit max1586_pmic_probe(struct i2c_client *client, |
183 | const struct i2c_device_id *i2c_id) | 183 | const struct i2c_device_id *i2c_id) |
184 | { | 184 | { |
185 | struct regulator_dev **rdev; | 185 | struct regulator_dev **rdev; |
186 | struct max1586_platform_data *pdata = client->dev.platform_data; | 186 | struct max1586_platform_data *pdata = client->dev.platform_data; |
@@ -235,7 +235,7 @@ out: | |||
235 | return ret; | 235 | return ret; |
236 | } | 236 | } |
237 | 237 | ||
238 | static int max1586_pmic_remove(struct i2c_client *client) | 238 | static int __devexit max1586_pmic_remove(struct i2c_client *client) |
239 | { | 239 | { |
240 | struct regulator_dev **rdev = i2c_get_clientdata(client); | 240 | struct regulator_dev **rdev = i2c_get_clientdata(client); |
241 | int i; | 241 | int i; |
@@ -257,9 +257,10 @@ MODULE_DEVICE_TABLE(i2c, max1586_id); | |||
257 | 257 | ||
258 | static struct i2c_driver max1586_pmic_driver = { | 258 | static struct i2c_driver max1586_pmic_driver = { |
259 | .probe = max1586_pmic_probe, | 259 | .probe = max1586_pmic_probe, |
260 | .remove = max1586_pmic_remove, | 260 | .remove = __devexit_p(max1586_pmic_remove), |
261 | .driver = { | 261 | .driver = { |
262 | .name = "max1586", | 262 | .name = "max1586", |
263 | .owner = THIS_MODULE, | ||
263 | }, | 264 | }, |
264 | .id_table = max1586_id, | 265 | .id_table = max1586_id, |
265 | }; | 266 | }; |