diff options
| author | Jonathan Cameron | 2011-05-18 15:42:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-05-20 01:15:06 +0200 |
| commit | 0ed731d2343f7ff964348377bde81c595f8af9e6 (patch) | |
| tree | 471eac40713d4f9105c6cd58a022ae78b21b2b95 /drivers/staging/iio/meter | |
| parent | staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify eve... (diff) | |
| download | kernel-qcow2-linux-0ed731d2343f7ff964348377bde81c595f8af9e6.tar.gz kernel-qcow2-linux-0ed731d2343f7ff964348377bde81c595f8af9e6.tar.xz kernel-qcow2-linux-0ed731d2343f7ff964348377bde81c595f8af9e6.zip | |
staging:iio: use pollfunc allocation helpers in remaining drivers.
Some didn't get converted the first time around.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/meter')
| -rw-r--r-- | drivers/staging/iio/meter/ade7758_ring.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index a5e48c1bd424..b89b7f882e84 100644 --- a/drivers/staging/iio/meter/ade7758_ring.c +++ b/drivers/staging/iio/meter/ade7758_ring.c @@ -142,8 +142,7 @@ void ade7758_unconfigure_ring(struct iio_dev *indio_dev) iio_trigger_dettach_poll_func(indio_dev->trig, indio_dev->pollfunc); } - kfree(indio_dev->pollfunc->name); - kfree(indio_dev->pollfunc); + iio_dealloc_pollfunc(indio_dev->pollfunc); iio_sw_rb_free(indio_dev->ring); } @@ -163,20 +162,17 @@ int ade7758_configure_ring(struct iio_dev *indio_dev) indio_dev->ring->setup_ops = &ade7758_ring_setup_ops; indio_dev->ring->owner = THIS_MODULE; - indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL); + indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, + &ade7758_trigger_handler, + 0, + indio_dev, + "ade7759_consumer%d", + indio_dev->id); if (indio_dev->pollfunc == NULL) { ret = -ENOMEM; goto error_iio_sw_rb_free; } - indio_dev->pollfunc->private_data = indio_dev; - indio_dev->pollfunc->h = &iio_pollfunc_store_time; - indio_dev->pollfunc->thread = &ade7758_trigger_handler; - indio_dev->pollfunc->name - = kasprintf(GFP_KERNEL, "ade7759_consumer%d", indio_dev->id); - if (indio_dev->pollfunc->name == NULL) { - ret = -ENOMEM; - goto error_free_pollfunc; - } + indio_dev->modes |= INDIO_RING_TRIGGERED; st->tx_buf[0] = ADE7758_READ_REG(ADE7758_RSTATUS); @@ -214,8 +210,6 @@ int ade7758_configure_ring(struct iio_dev *indio_dev) return 0; -error_free_pollfunc: - kfree(indio_dev->pollfunc); error_iio_sw_rb_free: iio_sw_rb_free(indio_dev->ring); return ret; |