Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b185f8 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio: poll func allocation clean up. 



Add a function to neatly deal with allocation of poll functions.
Ultimately this allows us to more easily change the implementation.

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e3796e6b

drivers/staging/iio/accel/adis16201_ring.c

+7 −15
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) 


void adis16201_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);

}
@@ -134,26 +133,19 @@ int adis16201_configure_ring(struct iio_dev *indio_dev) 
	iio_scan_mask_set(ring, ADIS16201_SCAN_INCLI_X);

	iio_scan_mask_set(ring, ADIS16201_SCAN_INCLI_Y);



	indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);

	indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,

						 &adis16201_trigger_handler,

						 IRQF_ONESHOT,

						 indio_dev,

						 "adis16201_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 = &adis16201_trigger_handler;

	indio_dev->pollfunc->type = IRQF_ONESHOT;

	indio_dev->pollfunc->name =

		kasprintf(GFP_KERNEL, "adis16201_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;

drivers/staging/iio/accel/adis16203_ring.c

+8 −15
Original line number Diff line number Diff line
@@ -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;

drivers/staging/iio/accel/adis16204_ring.c

+8 −15
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p) 


void adis16204_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);

}
@@ -134,27 +133,21 @@ int adis16204_configure_ring(struct iio_dev *indio_dev) 
	iio_scan_mask_set(ring, ADIS16204_SCAN_AUX_ADC);

	iio_scan_mask_set(ring, ADIS16204_SCAN_TEMP);



	indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);

	indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,

						 &adis16204_trigger_handler,

						 IRQF_ONESHOT,

						 indio_dev,

						 "%s_consumer%d",

						 indio_dev->name,

						 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 = &adis16204_trigger_handler;

	indio_dev->pollfunc->type = IRQF_ONESHOT;

	indio_dev->pollfunc->name =

		kasprintf(GFP_KERNEL, "adis16204_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;

drivers/staging/iio/accel/adis16209_ring.c

+9 −15
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p) 


void adis16209_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);

}
@@ -137,26 +136,21 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) 
	iio_scan_mask_set(ring, ADIS16209_SCAN_INCLI_Y);

	iio_scan_mask_set(ring, ADIS16209_SCAN_ROT);



	indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);

	indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,

						 &adis16209_trigger_handler,

						 IRQF_ONESHOT,

						 indio_dev,

						 "%s_consumer%d",

						 indio_dev->name,

						 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 = &adis16209_trigger_handler;

	indio_dev->pollfunc->type = IRQF_ONESHOT;

	indio_dev->pollfunc->name =

		kasprintf(GFP_KERNEL, "adis16209_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;

drivers/staging/iio/accel/adis16240_ring.c

+10 −16
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p) 


void adis16240_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);

}
@@ -132,27 +131,22 @@ int adis16240_configure_ring(struct iio_dev *indio_dev) 
	iio_scan_mask_set(ring, ADIS16240_SCAN_AUX_ADC);

	iio_scan_mask_set(ring, ADIS16240_SCAN_TEMP);



	indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);

	indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,

						 &adis16240_trigger_handler,

						 IRQF_ONESHOT,

						 indio_dev,

						 "%s_consumer%d",

						 indio_dev->name,

						 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 = &adis16240_trigger_handler;

	indio_dev->pollfunc->type = IRQF_ONESHOT;

	indio_dev->pollfunc->name =

		kasprintf(GFP_KERNEL, "adis16240_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;

}