diff options
Diffstat (limited to 'drivers/staging/iio/accel/adis16203_ring.c')
| -rw-r--r-- | drivers/staging/iio/accel/adis16203_ring.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c index 1b8863d2ff09..a9a789d79c09 100644 --- a/drivers/staging/iio/accel/adis16203_ring.c +++ b/drivers/staging/iio/accel/adis16203_ring.c @@ -103,8 +103,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) void adis16203_unconfigure_ring(struct iio_dev *indio_dev) { - kfree(indio_dev->pollfunc->name); - kfree(indio_dev->pollfunc); + iio_dealloc_pollfunc(indio_dev->pollfunc); iio_sw_rb_free(indio_dev->ring); } @@ -139,26 +138,20 @@ int adis16203_configure_ring(struct iio_dev *indio_dev) iio_scan_mask_set(ring, ADIS16203_SCAN_INCLI_X); iio_scan_mask_set(ring, ADIS16203_SCAN_INCLI_Y); - indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL); + indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time, + &adis16203_trigger_handler, + IRQF_ONESHOT, + indio_dev, + "adis16203_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 = &adis16203_trigger_handler; - indio_dev->pollfunc->type = IRQF_ONESHOT; - indio_dev->pollfunc->name = - kasprintf(GFP_KERNEL, "adis16203_consumer%d", indio_dev->id); - if (indio_dev->pollfunc->name == NULL) { - ret = -ENOMEM; - goto error_free_poll_func; - } indio_dev->modes |= INDIO_RING_TRIGGERED; return 0; -error_free_poll_func: - kfree(indio_dev->pollfunc); + error_iio_sw_rb_free: iio_sw_rb_free(indio_dev->ring); return ret; |