Skip to contentSkip to conversation

lis3lv02d: Fix read() call in lis3lv02d_get_odr()

PATCH In review Mark Brown 2 participants 4 messages Sep 6, 2011 – Sep 7, 2011

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/2 lis3lv02d: Fix read() call in lis3lv02d_get_odr()

The driver is passing a struct lis3lv02d ** to the read() operation but the read() operation wants a struct lis3lv02d * causing compiler warnings and presumably also runtime problems.

---
 drivers/misc/lis3lv02d/lis3lv02d.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/misc/lis3lv02d/lis3lv02d.c +1 -1
index e67dcea..72a1f92 100644
@@ -200,7 +200,7 @@ static int lis3lv02d_get_odr(struct lis3lv02d *lis3)
 	u8 ctrl;
 	int shift;
 
-	lis3->read(&lis3, CTRL_REG1, &ctrl);
+	lis3->read(lis3, CTRL_REG1, &ctrl);
 	ctrl &= lis3->odr_mask;
 	shift = ffs(lis3->odr_mask) - 1;
 	return lis3->odrs[(ctrl >> shift)];
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/2 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.

---
 drivers/misc/lis3lv02d/lis3lv02d_i2c.c |   34 +++++++++++--------------------
 include/linux/lis3lv02d.h              |    1 -
 2 files changed, 12 insertions(+), 23 deletions(-)
drivers/misc/lis3lv02d/lis3lv02d_i2c.c +12 -22
index 6cdc38f..c02fea0 100644
@@ -79,8 +79,7 @@ static int lis3_i2c_init(struct lis3lv02d *lis3)
 	u8 reg;
 	int ret;
 
-	if (lis3->reg_ctrl)
-		lis3_reg_ctrl(lis3, LIS3_REG_ON);
+	lis3_reg_ctrl(lis3, LIS3_REG_ON);
 
 	lis3->read(lis3, WHO_AM_I, &reg);
 	if (reg != lis3->whoami)
@@ -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,15 +126,13 @@ 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,
-					ARRAY_SIZE(lis3_dev.regulators),
-					lis3_dev.regulators);
-		if (ret < 0)
-			goto fail;
-	}
+	lis3_dev.regulators[0].supply = reg_vdd;
+	lis3_dev.regulators[1].supply = reg_vdd_io;
+	ret = regulator_bulk_get(&client->dev,
+				 ARRAY_SIZE(lis3_dev.regulators),
+				 lis3_dev.regulators);
+	if (ret < 0)
+		goto fail;
 
 	lis3_dev.pdata	  = pdata;
 	lis3_dev.bus_priv = client;
@@ -153,13 +146,11 @@ 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);
+	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);
+	lis3_reg_ctrl(&lis3_dev, LIS3_REG_OFF);
 
 	if (ret)
 		goto fail2;
@@ -185,9 +176,8 @@ 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);
+	regulator_bulk_free(ARRAY_SIZE(lis3->regulators),
+			    lis3_dev.regulators);
 	return 0;
 }
 
include/linux/lis3lv02d.h +0 -1
index d4292c8..f1664c6 100644
@@ -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;
Signature · 1 line
1.7.5.4
#2 lore raw
In reply to Mark Brown
Quoted 15 lines · On Tue, 6 Sep 2011 00:12:28 -0700 Mark Brown…

The driver is passing a struct lis3lv02d ** to the read() operation but the read() operation wants a struct lis3lv02d * causing compiler warnings and presumably also runtime problems.

---
 drivers/misc/lis3lv02d/lis3lv02d.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/misc/lis3lv02d/lis3lv02d.c +0 -0
index e67dcea..72a1f92 100644

drivers/misc/lis3lv02d/lis3lv02d.c static int lis3lv02d_get_odr(struct lis3lv02d *lis3) · line 206

Quoted 8 lines
drivers/misc/lis3lv02d/lis3lv02d.c +1 -1
@@ -200,7 +200,7 @@ static int lis3lv02d_get_odr(struct lis3lv02d *lis3)
 	u8 ctrl;
 	int shift;
 
-	lis3->read(&lis3, CTRL_REG1, &ctrl);
+	lis3->read(lis3, CTRL_REG1, &ctrl);
 	ctrl &= lis3->odr_mask;
 	shift = ffs(lis3->odr_mask) - 1;
 	return lis3->odrs[(ctrl >> shift)];

This not applicable to mainline or to -stable. It is a fix to lis3-remove-the-references-to-the-global-variable-in-core-driver.patch which I already have queued, as lis3-remove-the-references-to-the-global-variable-in-core-driver-fix.patch.

author
#3 lore raw
Quoted 4 lines · Andrew Morton

This not applicable to mainline or to -stable. It is a fix to lis3-remove-the-references-to-the-global-variable-in-core-driver.patch which I already have queued, as lis3-remove-the-references-to-the-global-variable-in-core-driver-fix.patch.

Hrm, strange - the fix doesn't seem to have shown up in -next before the breakin. Anyway, so long as it's fixed that's the main thing - thanks!