Diff
Modified: trunk/drivers/staging/iio/accel/adis16201.h (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16201.h 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16201.h 2010-10-23 10:31:40 UTC (rev 9296)
@@ -65,7 +65,6 @@
* struct adis16201_state - device instance specific data
* @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling
- * @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure
@@ -77,7 +76,6 @@
struct adis16201_state {
struct spi_device *us;
struct work_struct work_trigger_to_ring;
- struct iio_work_cont work_cont_thresh;
s64 last_timestamp;
struct iio_dev *indio_dev;
struct iio_trigger *trig;
Modified: trunk/drivers/staging/iio/accel/adis16201_ring.c (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16201_ring.c 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16201_ring.c 2010-10-23 10:31:40 UTC (rev 9296)
@@ -65,10 +65,10 @@
* adis16201_poll_func_th() top half interrupt handler called by trigger
* @private_data: iio_dev
**/
-static void adis16201_poll_func_th(struct iio_dev *indio_dev)
+static void adis16201_poll_func_th(struct iio_dev *indio_dev, s64 time)
{
struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
- st->last_timestamp = indio_dev->trig->timestamp;
+ st->last_timestamp = time;
schedule_work(&st->work_trigger_to_ring);
}
Modified: trunk/drivers/staging/iio/accel/adis16201_trigger.c (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16201_trigger.c 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16201_trigger.c 2010-10-23 10:31:40 UTC (rev 9296)
@@ -23,8 +23,7 @@
struct adis16201_state *st = iio_dev_get_devdata(dev_info);
struct iio_trigger *trig = st->trig;
- trig->timestamp = timestamp;
- iio_trigger_poll(trig);
+ iio_trigger_poll(trig, timestamp);
return IRQ_HANDLED;
}
@@ -83,14 +82,13 @@
struct adis16201_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
- st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
+ st->trig->name = kasprintf(GFP_KERNEL,
+ "adis16201-dev%d",
+ indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
- snprintf((char *)st->trig->name,
- IIO_TRIGGER_NAME_LENGTH,
- "adis16201-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;
Modified: trunk/drivers/staging/iio/accel/adis16203.h (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16203.h 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16203.h 2010-10-23 10:31:40 UTC (rev 9296)
@@ -60,7 +60,6 @@
* struct adis16203_state - device instance specific data
* @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling
- * @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure
@@ -72,7 +71,6 @@
struct adis16203_state {
struct spi_device *us;
struct work_struct work_trigger_to_ring;
- struct iio_work_cont work_cont_thresh;
s64 last_timestamp;
struct iio_dev *indio_dev;
struct iio_trigger *trig;
Modified: trunk/drivers/staging/iio/accel/adis16203_ring.c (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16203_ring.c 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16203_ring.c 2010-10-23 10:31:40 UTC (rev 9296)
@@ -59,10 +59,10 @@
* adis16203_poll_func_th() top half interrupt handler called by trigger
* @private_data: iio_dev
**/
-static void adis16203_poll_func_th(struct iio_dev *indio_dev)
+static void adis16203_poll_func_th(struct iio_dev *indio_dev, s64 timestamp)
{
struct adis16203_state *st = iio_dev_get_devdata(indio_dev);
- st->last_timestamp = indio_dev->trig->timestamp;
+ st->last_timestamp = timestamp;
schedule_work(&st->work_trigger_to_ring);
}
Modified: trunk/drivers/staging/iio/accel/adis16203_trigger.c (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16203_trigger.c 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16203_trigger.c 2010-10-23 10:31:40 UTC (rev 9296)
@@ -23,8 +23,7 @@
struct adis16203_state *st = iio_dev_get_devdata(dev_info);
struct iio_trigger *trig = st->trig;
- trig->timestamp = timestamp;
- iio_trigger_poll(trig);
+ iio_trigger_poll(trig, timestamp);
return IRQ_HANDLED;
}
@@ -83,14 +82,13 @@
struct adis16203_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
- st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
+ st->trig->name = kasprintf(GFP_KERNEL,
+ "adis16203-dev%d",
+ indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
- snprintf((char *)st->trig->name,
- IIO_TRIGGER_NAME_LENGTH,
- "adis16203-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;
Modified: trunk/drivers/staging/iio/accel/adis16204.h (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16204.h 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16204.h 2010-10-23 10:31:40 UTC (rev 9296)
@@ -68,7 +68,6 @@
* struct adis16204_state - device instance specific data
* @us: actual spi_device
* @work_trigger_to_ring: bh for triggered event handling
- * @work_cont_thresh: CLEAN
* @inter: used to check if new interrupt has been triggered
* @last_timestamp: passing timestamp from th to bh of interrupt handler
* @indio_dev: industrial I/O device structure
@@ -80,7 +79,6 @@
struct adis16204_state {
struct spi_device *us;
struct work_struct work_trigger_to_ring;
- struct iio_work_cont work_cont_thresh;
s64 last_timestamp;
struct iio_dev *indio_dev;
struct iio_trigger *trig;
Modified: trunk/drivers/staging/iio/accel/adis16204_ring.c (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16204_ring.c 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16204_ring.c 2010-10-23 10:31:40 UTC (rev 9296)
@@ -59,10 +59,10 @@
* adis16204_poll_func_th() top half interrupt handler called by trigger
* @private_data: iio_dev
**/
-static void adis16204_poll_func_th(struct iio_dev *indio_dev)
+static void adis16204_poll_func_th(struct iio_dev *indio_dev, s64 timestamp)
{
struct adis16204_state *st = iio_dev_get_devdata(indio_dev);
- st->last_timestamp = indio_dev->trig->timestamp;
+ st->last_timestamp = timestamp;
schedule_work(&st->work_trigger_to_ring);
}
Modified: trunk/drivers/staging/iio/accel/adis16204_trigger.c (9295 => 9296)
--- trunk/drivers/staging/iio/accel/adis16204_trigger.c 2010-10-23 09:38:54 UTC (rev 9295)
+++ trunk/drivers/staging/iio/accel/adis16204_trigger.c 2010-10-23 10:31:40 UTC (rev 9296)
@@ -23,8 +23,7 @@
struct adis16204_state *st = iio_dev_get_devdata(dev_info);
struct iio_trigger *trig = st->trig;
- trig->timestamp = timestamp;
- iio_trigger_poll(trig);
+ iio_trigger_poll(trig, timestamp);
return IRQ_HANDLED;
}
@@ -83,14 +82,13 @@
struct adis16204_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
- st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
+ st->trig->name = kasprintf(GFP_KERNEL,
+ "adis16204-dev%d",
+ indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
- snprintf((char *)st->trig->name,
- IIO_TRIGGER_NAME_LENGTH,
- "adis16204-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;
