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>
This commit is contained in:
parent
bd88c9b285
commit
308f100f2e
@ -345,7 +345,7 @@ static struct regulator_desc max8660_reg[] = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static int max8660_probe(struct i2c_client *client,
|
static int __devinit max8660_probe(struct i2c_client *client,
|
||||||
const struct i2c_device_id *i2c_id)
|
const struct i2c_device_id *i2c_id)
|
||||||
{
|
{
|
||||||
struct regulator_dev **rdev;
|
struct regulator_dev **rdev;
|
||||||
@ -354,7 +354,7 @@ static int max8660_probe(struct i2c_client *client,
|
|||||||
int boot_on, i, id, ret = -EINVAL;
|
int boot_on, i, id, ret = -EINVAL;
|
||||||
|
|
||||||
if (pdata->num_subdevs > MAX8660_V_END) {
|
if (pdata->num_subdevs > MAX8660_V_END) {
|
||||||
dev_err(&client->dev, "Too much regulators found!\n");
|
dev_err(&client->dev, "Too many regulators found!\n");
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -462,7 +462,7 @@ static int max8660_probe(struct i2c_client *client,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int max8660_remove(struct i2c_client *client)
|
static int __devexit max8660_remove(struct i2c_client *client)
|
||||||
{
|
{
|
||||||
struct regulator_dev **rdev = i2c_get_clientdata(client);
|
struct regulator_dev **rdev = i2c_get_clientdata(client);
|
||||||
int i;
|
int i;
|
||||||
@ -485,9 +485,10 @@ MODULE_DEVICE_TABLE(i2c, max8660_id);
|
|||||||
|
|
||||||
static struct i2c_driver max8660_driver = {
|
static struct i2c_driver max8660_driver = {
|
||||||
.probe = max8660_probe,
|
.probe = max8660_probe,
|
||||||
.remove = max8660_remove,
|
.remove = __devexit_p(max8660_remove),
|
||||||
.driver = {
|
.driver = {
|
||||||
.name = "max8660",
|
.name = "max8660",
|
||||||
|
.owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.id_table = max8660_id,
|
.id_table = max8660_id,
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user