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

Commit ec400c9f authored by Mark Brown's avatar Mark Brown Committed by Linus Torvalds
Browse files

lis3lv02d: make regulator API usage unconditional 



The regulator API contains a range of features for stubbing itself out
when not in use and for transparently restricting the actual effect of
regulator API calls where they can't be supported on a particular system
so that drivers don't need to individually implement this.  Simplify the
driver slightly by making use of this idiom.

The only in tree user is ecovec24 which does not use the regulator API.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Éric Piel <eric.piel@tremplin-utc.net>
Cc: Ilkka Koskinen <ilkka.koskinen@nokia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 895c156c

drivers/misc/lis3lv02d/lis3lv02d_i2c.c

+12 −22
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static int lis3_i2c_init(struct lis3lv02d *lis3) 
	u8 reg;

	int ret;



	if (lis3->reg_ctrl)

	lis3_reg_ctrl(lis3, LIS3_REG_ON);



	lis3->read(lis3, WHO_AM_I, &reg);
@@ -106,10 +105,6 @@ static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client, 
	struct lis3lv02d_platform_data *pdata = client->dev.platform_data;



	if (pdata) {

		/* Regulator control is optional */

		if (pdata->driver_features & LIS3_USE_REGULATOR_CTRL)

			lis3_dev.reg_ctrl = lis3_reg_ctrl;



		if ((pdata->driver_features & LIS3_USE_BLOCK_READ) &&

			(i2c_check_functionality(client->adapter,

						I2C_FUNC_SMBUS_I2C_BLOCK)))
@@ -131,7 +126,6 @@ static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client, 
			goto fail;

	}



	if (lis3_dev.reg_ctrl) {

	lis3_dev.regulators[0].supply = reg_vdd;

	lis3_dev.regulators[1].supply = reg_vdd_io;

	ret = regulator_bulk_get(&client->dev,
@@ -139,7 +133,6 @@ static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client, 
				 lis3_dev.regulators);

	if (ret < 0)

		goto fail;

	}



	lis3_dev.pdata	  = pdata;

	lis3_dev.bus_priv = client;
@@ -153,12 +146,10 @@ static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client, 
	i2c_set_clientdata(client, &lis3_dev);



	/* Provide power over the init call */

	if (lis3_dev.reg_ctrl)

	lis3_reg_ctrl(&lis3_dev, LIS3_REG_ON);



	ret = lis3lv02d_init_device(&lis3_dev);



	if (lis3_dev.reg_ctrl)

	lis3_reg_ctrl(&lis3_dev, LIS3_REG_OFF);



	if (ret)
@@ -185,7 +176,6 @@ static int __devexit lis3lv02d_i2c_remove(struct i2c_client *client) 
	lis3lv02d_joystick_disable(lis3);

	lis3lv02d_remove_fs(&lis3_dev);



	if (lis3_dev.reg_ctrl)

	regulator_bulk_free(ARRAY_SIZE(lis3->regulators),

			    lis3_dev.regulators);

	return 0;

include/linux/lis3lv02d.h

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ struct lis3lv02d_platform_data { 
	s8 axis_x;

	s8 axis_y;

	s8 axis_z;

#define LIS3_USE_REGULATOR_CTRL 0x01

#define LIS3_USE_BLOCK_READ	0x02

	u16 driver_features;

	int default_rate;