From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <4FDEDF3A.7030601@free-electrons.com> Date: Mon, 18 Jun 2012 09:56:42 +0200 From: Maxime Ripard MIME-Version: 1.0 To: Lars-Peter Clausen CC: Jonathan Cameron , linux-iio@vger.kernel.org Subject: Re: [v2 2/9] iio:adc:at91: Use new triggered buffer setup helper References: <1339145332-26811-1-git-send-email-lars@metafoo.de> <1339145332-26811-2-git-send-email-lars@metafoo.de> <4FDB6399.8080209@metafoo.de> In-Reply-To: <4FDB6399.8080209@metafoo.de> Content-Type: text/plain; charset=ISO-8859-1 List-ID: Hi Lars-Peter, Sorry, I thought Jonathan's Acked-by was enough. I'm definitely ok with these changes, you can add my acked-by. Maxime Le 15/06/2012 18:32, Lars-Peter Clausen a =E9crit : > On 06/08/2012 10:48 AM, Lars-Peter Clausen wrote: >> Use the new triggered buffer setup helper function to allocate and reg= ister >> buffer and pollfunc. >> >> Signed-off-by: Lars-Peter Clausen >> Cc: Maxime Ripard >> Acked-by: Jonathan Cameron >=20 > Hi Maxime, >=20 > Can you take a look at this patch and say whether you are OK with it? I= 've > only compile tested it since I don't have the hardware, but I don't exp= ect > any problems since the conversion is straight forward and a similar > conversion has been done for other drivers as well, which worked fine s= o far. >=20 > Thanks, > - Lars >=20 >=20 >> --- >> drivers/iio/adc/Kconfig | 3 +-- >> drivers/iio/adc/at91_adc.c | 51 ++++-------------------------------= --------- >> 2 files changed, 5 insertions(+), 49 deletions(-) >> >> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig >> index 9a0df81..4f7f584 100644 >> --- a/drivers/iio/adc/Kconfig >> +++ b/drivers/iio/adc/Kconfig >> @@ -7,8 +7,7 @@ config AT91_ADC >> tristate "Atmel AT91 ADC" >> depends on ARCH_AT91 >> select IIO_BUFFER >> - select IIO_KFIFO_BUF >> - select IIO_TRIGGER >> + select IIO_TRIGGERED_BUFFER >> select SYSFS >> help >> Say yes here to build support for Atmel AT91 ADC. >> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c >> index f18a95d..6a08469 100644 >> --- a/drivers/iio/adc/at91_adc.c >> +++ b/drivers/iio/adc/at91_adc.c >> @@ -26,9 +26,9 @@ >> =20 >> #include >> #include >> -#include >> #include >> #include >> +#include >> =20 >> #include >> =20 >> @@ -318,58 +318,15 @@ static void at91_adc_trigger_remove(struct iio_d= ev *idev) >> } >> } >> =20 >> -static const struct iio_buffer_setup_ops at91_adc_buffer_ops =3D { >> - .preenable =3D &iio_sw_buffer_preenable, >> - .postenable =3D &iio_triggered_buffer_postenable, >> - .predisable =3D &iio_triggered_buffer_predisable, >> -}; >> - >> static int at91_adc_buffer_init(struct iio_dev *idev) >> { >> - int ret; >> - >> - idev->buffer =3D iio_kfifo_allocate(idev); >> - if (!idev->buffer) { >> - ret =3D -ENOMEM; >> - goto error_ret; >> - } >> - >> - idev->pollfunc =3D iio_alloc_pollfunc(&iio_pollfunc_store_time, >> - &at91_adc_trigger_handler, >> - IRQF_ONESHOT, >> - idev, >> - "%s-consumer%d", >> - idev->name, >> - idev->id); >> - if (idev->pollfunc =3D=3D NULL) { >> - ret =3D -ENOMEM; >> - goto error_pollfunc; >> - } >> - >> - idev->setup_ops =3D &at91_adc_buffer_ops; >> - idev->modes |=3D INDIO_BUFFER_TRIGGERED; >> - >> - ret =3D iio_buffer_register(idev, >> - idev->channels, >> - idev->num_channels); >> - if (ret) >> - goto error_register; >> - >> - return 0; >> - >> -error_register: >> - iio_dealloc_pollfunc(idev->pollfunc); >> -error_pollfunc: >> - iio_kfifo_free(idev->buffer); >> -error_ret: >> - return ret; >> + return iio_triggered_buffer_setup(idev, &iio_pollfunc_store_time, >> + &at91_adc_trigger_handler, NULL); >> } >> =20 >> static void at91_adc_buffer_remove(struct iio_dev *idev) >> { >> - iio_buffer_unregister(idev); >> - iio_dealloc_pollfunc(idev->pollfunc); >> - iio_kfifo_free(idev->buffer); >> + iio_triggered_buffer_cleanup(idev); >> } >> =20 >> static int at91_adc_read_raw(struct iio_dev *idev, >=20 --=20 Maxime Ripard, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com