From 0ed731d2343f7ff964348377bde81c595f8af9e6 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 18 May 2011 14:42:39 +0100 Subject: staging:iio: use pollfunc allocation helpers in remaining drivers. Some didn't get converted the first time around. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/adc/ad7298_ring.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'drivers/staging/iio/adc/ad7298_ring.c') diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c index d0a0aeaaf..a04c033 100644 --- a/drivers/staging/iio/adc/ad7298_ring.c +++ b/drivers/staging/iio/adc/ad7298_ring.c @@ -164,20 +164,18 @@ int ad7298_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(NULL, + &ad7298_trigger_handler, + IRQF_ONESHOT, + indio_dev, + "ad7298_consumer%d", + 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->thread = &ad7298_trigger_handler; - indio_dev->pollfunc->type = IRQF_ONESHOT; - indio_dev->pollfunc->name = - kasprintf(GFP_KERNEL, "ad7298_consumer%d", 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 = &ad7298_ring_setup_ops; indio_dev->ring->scan_timestamp = true; @@ -185,8 +183,7 @@ int ad7298_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: @@ -200,7 +197,6 @@ void ad7298_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); } -- cgit v1.1