diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-05-18 14:42:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:15:06 -0700 |
| commit | 0ed731d2343f7ff964348377bde81c595f8af9e6 (patch) | |
| tree | 471eac40713d4f9105c6cd58a022ae78b21b2b95 /drivers/staging/iio/adc/ad7606_ring.c | |
| parent | 58f0a255454dc2338d24d9827eadbd9db386acc5 (diff) | |
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/adc/ad7606_ring.c')
| -rw-r--r-- | drivers/staging/iio/adc/ad7606_ring.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c index 85cde6a92070..a199bf48396c 100644 --- a/drivers/staging/iio/adc/ad7606_ring.c +++ b/drivers/staging/iio/adc/ad7606_ring.c @@ -169,22 +169,18 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) /* Effectively select the ring buffer implementation */ indio_dev->ring->access = &ring_sw_access_funcs; - indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL); + indio_dev->pollfunc = iio_alloc_pollfunc(&ad7606_trigger_handler_th_bh, + &ad7606_trigger_handler_th_bh, + 0, + indio_dev, + "%s_consumer%d", + indio_dev->name, + indio_dev->id); if (indio_dev->pollfunc == NULL) { ret = -ENOMEM; goto error_deallocate_sw_rb; } - indio_dev->pollfunc->private_data = indio_dev; - indio_dev->pollfunc->h = &ad7606_trigger_handler_th_bh; - indio_dev->pollfunc->thread = &ad7606_trigger_handler_th_bh; - indio_dev->pollfunc->name = - kasprintf(GFP_KERNEL, "%s_consumer%d", indio_dev->name, - indio_dev->id); - if (indio_dev->pollfunc->name == NULL) { - ret = -ENOMEM; - goto error_free_poll_func; - } /* Ring buffer functions - here trigger setup related */ indio_dev->ring->setup_ops = &ad7606_ring_setup_ops; @@ -195,8 +191,7 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) /* Flag that polled ring buffering is possible */ indio_dev->modes |= INDIO_RING_TRIGGERED; return 0; -error_free_poll_func: - kfree(indio_dev->pollfunc); + error_deallocate_sw_rb: iio_sw_rb_free(indio_dev->ring); error_ret: @@ -210,7 +205,6 @@ void ad7606_ring_cleanup(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); } |