Title: [9297] trunk/drivers/staging/iio/meter: staging: iio: ade7758: update to current abi
- Revision
- 9297
- Author
- vapier
- Date
- 2010-10-23 06:57:57 -0400 (Sat, 23 Oct 2010)
Log Message
staging: iio: ade7758: update to current abi
Modified Paths
Diff
Modified: trunk/drivers/staging/iio/meter/ade7758.h (9296 => 9297)
--- trunk/drivers/staging/iio/meter/ade7758.h 2010-10-23 10:31:40 UTC (rev 9296)
+++ trunk/drivers/staging/iio/meter/ade7758.h 2010-10-23 10:57:57 UTC (rev 9297)
@@ -93,7 +93,6 @@
* struct ade7758_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
@@ -105,7 +104,6 @@
struct ade7758_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/meter/ade7758_ring.c (9296 => 9297)
--- trunk/drivers/staging/iio/meter/ade7758_ring.c 2010-10-23 10:31:40 UTC (rev 9296)
+++ trunk/drivers/staging/iio/meter/ade7758_ring.c 2010-10-23 10:57:57 UTC (rev 9297)
@@ -49,10 +49,10 @@
* ade7758_poll_func_th() top half interrupt handler called by trigger
* @private_data: iio_dev
**/
-static void ade7758_poll_func_th(struct iio_dev *indio_dev)
+static void ade7758_poll_func_th(struct iio_dev *indio_dev, s64 time)
{
struct ade7758_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);
/* Indicate that this interrupt is being handled */
Modified: trunk/drivers/staging/iio/meter/ade7758_trigger.c (9296 => 9297)
--- trunk/drivers/staging/iio/meter/ade7758_trigger.c 2010-10-23 10:31:40 UTC (rev 9296)
+++ trunk/drivers/staging/iio/meter/ade7758_trigger.c 2010-10-23 10:57:57 UTC (rev 9297)
@@ -23,8 +23,7 @@
struct ade7758_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;
}
@@ -86,14 +85,13 @@
struct ade7758_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,
+ "ade7758-dev%d",
+ indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
- snprintf((char *)st->trig->name,
- IIO_TRIGGER_NAME_LENGTH,
- "ade7758-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
