Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 308f100f authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Liam Girdwood
Browse files

Regulators: max8660 - annotate probe and remove methods 



Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent bd88c9b2

drivers/regulator/max8660.c

+6 −5
Original line number Diff line number Diff line
@@ -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)

{

	struct regulator_dev **rdev;
@@ -354,7 +354,7 @@ static int max8660_probe(struct i2c_client *client, 
	int boot_on, i, id, ret = -EINVAL;



	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;

	}
@@ -462,7 +462,7 @@ out: 
	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);

	int i;
@@ -485,9 +485,10 @@ MODULE_DEVICE_TABLE(i2c, max8660_id); 


static struct i2c_driver max8660_driver = {

	.probe = max8660_probe,

	.remove = max8660_remove,

	.remove = __devexit_p(max8660_remove),

	.driver		= {

		.name	= "max8660",

		.owner	= THIS_MODULE,

	},

	.id_table	= max8660_id,

};