Merge tag 'iio-fixes-for-3.11a' of git://git.kernel.org/pub/scm/linux/kernel/git…

…/jic23/iio into staging-linus Jonathan writes: The first round of IIO fixes for the 3.11 cycle. This set is larger than I would like, partly due to my lack of review time in the weeks before the merge window and partly because a couple of large drivers and the subsystem as a whole seem to be getting a lot more exposure and testing recently. 1) A long term bug in trigger handling gave a double free of the device. 2) Wrong return value handling means offsets are ignored in iio_convert_raw_to_processed_unlocked. 3) The iio_channel_has_info utility function was incorrectly updated during the recent info_mask split, this is now fixed. 4) mxs-lradc has a couple of little fixes. 5) A couple of missing .driver_module entries meant that drivers could be removed from underneath their users. 6) Error path fixes for ad7303 and lis3l02dq. 7) The scale value for presure in the lps331ap driver was out by a factor of 100.

Merge tag 'iio-fixes-for-3.11a' of git://git.kernel.org/pub/scm/linux/kernel/git…
…/jic23/iio into staging-linus Jonathan writes: The first round of IIO fixes for the 3.11 cycle. This set is larger than I would like, partly due to my lack of review time in the weeks before the merge window and partly because a couple of large drivers and the subsystem as a whole seem to be getting a lot more exposure and testing recently. 1) A long term bug in trigger handling gave a double free of the device. 2) Wrong return value handling means offsets are ignored in iio_convert_raw_to_processed_unlocked. 3) The iio_channel_has_info utility function was incorrectly updated during the recent info_mask split, this is now fixed. 4) mxs-lradc has a couple of little fixes. 5) A couple of missing .driver_module entries meant that drivers could be removed from underneath their users. 6) Error path fixes for ad7303 and lis3l02dq. 7) The scale value for presure in the lps331ap driver was out by a factor of 100.
Greg Kroah-Hartman
2 parents ade7615de0 67dbf54a3b
Showing 9 changed files Side-by-side Diff
drivers/iio/adc/ti_am335x_adc.c
drivers/iio/dac/ad7303.c
drivers/iio/industrialio-trigger.c
drivers/iio/inkern.c
drivers/iio/pressure/st_pressure_core.c
drivers/staging/iio/accel/lis3l02dq_core.c
drivers/staging/iio/adc/ad7291.c
drivers/staging/iio/adc/mxs-lradc.c
include/linux/iio/iio.h
@@ -183,6 +183,7 @@
  
 static const struct iio_info tiadc_info = {
 	.read_raw = &tiadc_read_raw,
+	.driver_module = THIS_MODULE,
 };
  
 static int tiadc_probe(struct platform_device *pdev)
@@ -235,8 +235,10 @@
  
 	if (ext_ref) {
 		st->vref_reg = regulator_get(&spi->dev, "REF");
-		if (IS_ERR(st->vref_reg))
+		if (IS_ERR(st->vref_reg)) {
+			ret = PTR_ERR(st->vref_reg);
 			goto err_disable_vdd_reg;
+		}
  
 		ret = regulator_enable(st->vref_reg);
 		if (ret)
@@ -104,7 +104,7 @@
  
 	ida_simple_remove(&iio_trigger_ida, trig_info->id);
 	/* Possible issue in here */
-	device_unregister(&trig_info->dev);
+	device_del(&trig_info->dev);
 }
 EXPORT_SYMBOL(iio_trigger_unregister);
  
@@ -451,7 +451,7 @@
 	int ret;
  
 	ret = iio_channel_read(chan, &offset, NULL, IIO_CHAN_INFO_OFFSET);
-	if (ret == 0)
+	if (ret >= 0)
 		raw64 += offset;
  
 	scale_type = iio_channel_read(chan, &scale_val, &scale_val2,
@@ -28,7 +28,9 @@
 #include <linux/iio/common/st_sensors.h>
 #include "st_pressure.h"
  
-#define ST_PRESS_MBAR_TO_KPASCAL(x)		(x * 10)
+#define ST_PRESS_LSB_PER_MBAR			4096UL
+#define ST_PRESS_KPASCAL_NANO_SCALE		(100000000UL / \
+						 ST_PRESS_LSB_PER_MBAR)
 #define ST_PRESS_NUMBER_DATA_CHANNELS		1
  
 /* DEFAULT VALUE FOR SENSORS */
  
@@ -51,8 +53,8 @@
 #define ST_PRESS_1_FS_ADDR			0x23
 #define ST_PRESS_1_FS_MASK			0x30
 #define ST_PRESS_1_FS_AVL_1260_VAL		0x00
-#define ST_PRESS_1_FS_AVL_1260_GAIN		ST_PRESS_MBAR_TO_KPASCAL(244141)
 #define ST_PRESS_1_FS_AVL_TEMP_GAIN		2083000
+#define ST_PRESS_1_FS_AVL_1260_GAIN		ST_PRESS_KPASCAL_NANO_SCALE
 #define ST_PRESS_1_BDU_ADDR			0x20
 #define ST_PRESS_1_BDU_MASK			0x04
 #define ST_PRESS_1_DRDY_IRQ_ADDR		0x22
@@ -257,6 +257,8 @@
 			ret = lis3l02dq_read_reg_s16(indio_dev, reg, val);
 		}
 		mutex_unlock(&indio_dev->mlock);
+		if (ret < 0)
+			goto error_ret;
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
 		*val = 0;
@@ -517,6 +517,7 @@
 	.read_event_value = &ad7291_read_event_value,
 	.write_event_value = &ad7291_write_event_value,
 	.event_attrs = &ad7291_event_attribute_group,
+	.driver_module = THIS_MODULE,
 };
  
 static int ad7291_probe(struct i2c_client *client,
@@ -234,7 +234,6 @@
 {
 	struct mxs_lradc *lradc = iio_priv(iio_dev);
 	int ret;
-	unsigned long mask;
  
 	if (m != IIO_CHAN_INFO_RAW)
 		return -EINVAL;
@@ -243,12 +242,6 @@
 	if (chan->channel > LRADC_MAX_TOTAL_CHANS)
 		return -EINVAL;
  
-	/* Validate the channel if it doesn't intersect with reserved chans. */
-	bitmap_set(&mask, chan->channel, 1);
-	ret = iio_validate_scan_mask_onehot(iio_dev, &mask);
-	if (ret)
-		return -EINVAL;
-
 	/*
 	 * See if there is no buffered operation in progess. If there is, simply
 	 * bail out. This can be improved to support both buffered and raw IO at
  
@@ -661,12 +654,13 @@
 {
 	int ret;
 	struct iio_trigger *trig;
+	struct mxs_lradc *lradc = iio_priv(iio);
  
 	trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id);
 	if (trig == NULL)
 		return -ENOMEM;
  
-	trig->dev.parent = iio->dev.parent;
+	trig->dev.parent = lradc->dev;
 	iio_trigger_set_drvdata(trig, iio);
 	trig->ops = &mxs_lradc_trigger_ops;
  
  
@@ -676,15 +670,17 @@
 		return ret;
 	}
  
-	iio->trig = trig;
+	lradc->trig = trig;
  
 	return 0;
 }
  
 static void mxs_lradc_trigger_remove(struct iio_dev *iio)
 {
-	iio_trigger_unregister(iio->trig);
-	iio_trigger_free(iio->trig);
+	struct mxs_lradc *lradc = iio_priv(iio);
+
+	iio_trigger_unregister(lradc->trig);
+	iio_trigger_free(lradc->trig);
 }
  
 static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
@@ -211,8 +211,8 @@
 static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
 	enum iio_chan_info_enum type)
 {
-	return (chan->info_mask_separate & type) |
-	       (chan->info_mask_shared_by_type & type);
+	return (chan->info_mask_separate & BIT(type)) |
+	       (chan->info_mask_shared_by_type & BIT(type));
 }
  
 #define IIO_ST(si, rb, sb, sh)						\
...	...	@@ -183,6 +183,7 @@
183	183
184	184	static const struct iio_info tiadc_info = {
185	185	.read_raw = &tiadc_read_raw,
	186	+ .driver_module = THIS_MODULE,
186	187	};
187	188
188	189	static int tiadc_probe(struct platform_device *pdev)
...	...	@@ -235,8 +235,10 @@
235	235
236	236	if (ext_ref) {
237	237	st->vref_reg = regulator_get(&spi->dev, "REF");
238		- if (IS_ERR(st->vref_reg))
	238	+ if (IS_ERR(st->vref_reg)) {
	239	+ ret = PTR_ERR(st->vref_reg);
239	240	goto err_disable_vdd_reg;
	241	+ }
240	242
241	243	ret = regulator_enable(st->vref_reg);
242	244	if (ret)
...	...	@@ -104,7 +104,7 @@
104	104
105	105	ida_simple_remove(&iio_trigger_ida, trig_info->id);
106	106	/* Possible issue in here */
107		- device_unregister(&trig_info->dev);
	107	+ device_del(&trig_info->dev);
108	108	}
109	109	EXPORT_SYMBOL(iio_trigger_unregister);
110	110
...	...	@@ -451,7 +451,7 @@
451	451	int ret;
452	452
453	453	ret = iio_channel_read(chan, &offset, NULL, IIO_CHAN_INFO_OFFSET);
454		- if (ret == 0)
	454	+ if (ret >= 0)
455	455	raw64 += offset;
456	456
457	457	scale_type = iio_channel_read(chan, &scale_val, &scale_val2,
...	...	@@ -28,7 +28,9 @@
28	28	#include <linux/iio/common/st_sensors.h>
29	29	#include "st_pressure.h"
30	30
31		-#define ST_PRESS_MBAR_TO_KPASCAL(x) (x * 10)
	31	+#define ST_PRESS_LSB_PER_MBAR 4096UL
	32	+#define ST_PRESS_KPASCAL_NANO_SCALE (100000000UL / \
	33	+ ST_PRESS_LSB_PER_MBAR)
32	34	#define ST_PRESS_NUMBER_DATA_CHANNELS 1
33	35
34	36	/* DEFAULT VALUE FOR SENSORS */
35	37
...	...	@@ -51,8 +53,8 @@
51	53	#define ST_PRESS_1_FS_ADDR 0x23
52	54	#define ST_PRESS_1_FS_MASK 0x30
53	55	#define ST_PRESS_1_FS_AVL_1260_VAL 0x00
54		-#define ST_PRESS_1_FS_AVL_1260_GAIN ST_PRESS_MBAR_TO_KPASCAL(244141)
55	56	#define ST_PRESS_1_FS_AVL_TEMP_GAIN 2083000
	57	+#define ST_PRESS_1_FS_AVL_1260_GAIN ST_PRESS_KPASCAL_NANO_SCALE
56	58	#define ST_PRESS_1_BDU_ADDR 0x20
57	59	#define ST_PRESS_1_BDU_MASK 0x04
58	60	#define ST_PRESS_1_DRDY_IRQ_ADDR 0x22
...	...	@@ -257,6 +257,8 @@
257	257	ret = lis3l02dq_read_reg_s16(indio_dev, reg, val);
258	258	}
259	259	mutex_unlock(&indio_dev->mlock);
	260	+ if (ret < 0)
	261	+ goto error_ret;
260	262	return IIO_VAL_INT;
261	263	case IIO_CHAN_INFO_SCALE:
262	264	*val = 0;
...	...	@@ -517,6 +517,7 @@
517	517	.read_event_value = &ad7291_read_event_value,
518	518	.write_event_value = &ad7291_write_event_value,
519	519	.event_attrs = &ad7291_event_attribute_group,
	520	+ .driver_module = THIS_MODULE,
520	521	};
521	522
522	523	static int ad7291_probe(struct i2c_client *client,
...	...	@@ -234,7 +234,6 @@
234	234	{
235	235	struct mxs_lradc *lradc = iio_priv(iio_dev);
236	236	int ret;
237		- unsigned long mask;
238	237
239	238	if (m != IIO_CHAN_INFO_RAW)
240	239	return -EINVAL;
...	...	@@ -243,12 +242,6 @@
243	242	if (chan->channel > LRADC_MAX_TOTAL_CHANS)
244	243	return -EINVAL;
245	244
246		- /* Validate the channel if it doesn't intersect with reserved chans. */
247		- bitmap_set(&mask, chan->channel, 1);
248		- ret = iio_validate_scan_mask_onehot(iio_dev, &mask);
249		- if (ret)
250		- return -EINVAL;
251		-
252	245	/*
253	246	* See if there is no buffered operation in progess. If there is, simply
254	247	* bail out. This can be improved to support both buffered and raw IO at
255	248
...	...	@@ -661,12 +654,13 @@
661	654	{
662	655	int ret;
663	656	struct iio_trigger *trig;
	657	+ struct mxs_lradc *lradc = iio_priv(iio);
664	658
665	659	trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id);
666	660	if (trig == NULL)
667	661	return -ENOMEM;
668	662
669		- trig->dev.parent = iio->dev.parent;
	663	+ trig->dev.parent = lradc->dev;
670	664	iio_trigger_set_drvdata(trig, iio);
671	665	trig->ops = &mxs_lradc_trigger_ops;
672	666
673	667
...	...	@@ -676,15 +670,17 @@
676	670	return ret;
677	671	}
678	672
679		- iio->trig = trig;
	673	+ lradc->trig = trig;
680	674
681	675	return 0;
682	676	}
683	677
684	678	static void mxs_lradc_trigger_remove(struct iio_dev *iio)
685	679	{
686		- iio_trigger_unregister(iio->trig);
687		- iio_trigger_free(iio->trig);
	680	+ struct mxs_lradc *lradc = iio_priv(iio);
	681	+
	682	+ iio_trigger_unregister(lradc->trig);
	683	+ iio_trigger_free(lradc->trig);
688	684	}
689	685
690	686	static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
...	...	@@ -211,8 +211,8 @@
211	211	static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
212	212	enum iio_chan_info_enum type)
213	213	{
214		- return (chan->info_mask_separate & type) \|
215		- (chan->info_mask_shared_by_type & type);
	214	+ return (chan->info_mask_separate & BIT(type)) \|
	215	+ (chan->info_mask_shared_by_type & BIT(type));
216	216	}
217	217
218	218	#define IIO_ST(si, rb, sb, sh) \