diff mbox series

[1/5] iio: imu: adis16400: move trigger handler into adis16400_core

Message ID 20190322204442.4035-1-ardeleanalex@gmail.com (mailing list archive)
State New, archived
Headers show
Series [1/5] iio: imu: adis16400: move trigger handler into adis16400_core | expand

Commit Message

Alexandru Ardelean March 22, 2019, 8:44 p.m. UTC 
From: Alexandru Ardelean <alexandru.ardelean@analog.com>

The trigger handler for the ADIS16400 is very different from the generic
one in the ADIS library. Keeping it in a separate file won't make much
sense once the update_scan_mode function will be made more generic and
moved into the ADIS library.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
 drivers/iio/imu/adis16400.h        |  2 --
 drivers/iio/imu/adis16400_buffer.c | 41 --------------------------
 drivers/iio/imu/adis16400_core.c   | 46 ++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 43 deletions(-)

Comments

Jonathan Cameron March 24, 2019, 3:04 p.m. UTC | #1 
On Fri, 22 Mar 2019 22:44:38 +0200
Alexandru Ardelean <ardeleanalex@gmail.com> wrote:

> From: Alexandru Ardelean <alexandru.ardelean@analog.com>
> 
> The trigger handler for the ADIS16400 is very different from the generic
> one in the ADIS library. Keeping it in a separate file won't make much
> sense once the update_scan_mode function will be made more generic and
> moved into the ADIS library.
> 
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Seems fine to me.

Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.

Thanks,

Jonathan

> ---
>  drivers/iio/imu/adis16400.h        |  2 --
>  drivers/iio/imu/adis16400_buffer.c | 41 --------------------------
>  drivers/iio/imu/adis16400_core.c   | 46 ++++++++++++++++++++++++++++++
>  3 files changed, 46 insertions(+), 43 deletions(-)
> 
> diff --git a/drivers/iio/imu/adis16400.h b/drivers/iio/imu/adis16400.h
> index 73b189c1c0fb..93b6c0c41fdd 100644
> --- a/drivers/iio/imu/adis16400.h
> +++ b/drivers/iio/imu/adis16400.h
> @@ -203,12 +203,10 @@ ssize_t adis16400_read_data_from_ring(struct device *dev,
>  
>  int adis16400_update_scan_mode(struct iio_dev *indio_dev,
>  	const unsigned long *scan_mask);
> -irqreturn_t adis16400_trigger_handler(int irq, void *p);
>  
>  #else /* CONFIG_IIO_BUFFER */
>  
>  #define adis16400_update_scan_mode NULL
> -#define adis16400_trigger_handler NULL
>  
>  #endif /* CONFIG_IIO_BUFFER */
>  
> diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c
> index e70a5339acb1..268349eb51c7 100644
> --- a/drivers/iio/imu/adis16400_buffer.c
> +++ b/drivers/iio/imu/adis16400_buffer.c
> @@ -58,44 +58,3 @@ int adis16400_update_scan_mode(struct iio_dev *indio_dev,
>  
>  	return 0;
>  }
> -
> -irqreturn_t adis16400_trigger_handler(int irq, void *p)
> -{
> -	struct iio_poll_func *pf = p;
> -	struct iio_dev *indio_dev = pf->indio_dev;
> -	struct adis16400_state *st = iio_priv(indio_dev);
> -	struct adis *adis = &st->adis;
> -	u32 old_speed_hz = st->adis.spi->max_speed_hz;
> -	void *buffer;
> -	int ret;
> -
> -	if (!adis->buffer)
> -		return -ENOMEM;
> -
> -	if (!(st->variant->flags & ADIS16400_NO_BURST) &&
> -		st->adis.spi->max_speed_hz > ADIS16400_SPI_BURST) {
> -		st->adis.spi->max_speed_hz = ADIS16400_SPI_BURST;
> -		spi_setup(st->adis.spi);
> -	}
> -
> -	ret = spi_sync(adis->spi, &adis->msg);
> -	if (ret)
> -		dev_err(&adis->spi->dev, "Failed to read data: %d\n", ret);
> -
> -	if (!(st->variant->flags & ADIS16400_NO_BURST)) {
> -		st->adis.spi->max_speed_hz = old_speed_hz;
> -		spi_setup(st->adis.spi);
> -	}
> -
> -	if (st->variant->flags & ADIS16400_BURST_DIAG_STAT)
> -		buffer = adis->buffer + sizeof(u16);
> -	else
> -		buffer = adis->buffer;
> -
> -	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
> -		pf->timestamp);
> -
> -	iio_trigger_notify_done(indio_dev->trig);
> -
> -	return IRQ_HANDLED;
> -}
> diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c
> index 9b697d35dbef..34d52863377a 100644
> --- a/drivers/iio/imu/adis16400_core.c
> +++ b/drivers/iio/imu/adis16400_core.c
> @@ -31,6 +31,7 @@
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
>  #include <linux/iio/buffer.h>
> +#include <linux/iio/trigger_consumer.h>
>  
>  #include "adis16400.h"
>  
> @@ -465,6 +466,51 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
>  	}
>  }
>  
> +#if IS_ENABLED(CONFIG_IIO_BUFFER)
> +static irqreturn_t adis16400_trigger_handler(int irq, void *p)
> +{
> +	struct iio_poll_func *pf = p;
> +	struct iio_dev *indio_dev = pf->indio_dev;
> +	struct adis16400_state *st = iio_priv(indio_dev);
> +	struct adis *adis = &st->adis;
> +	u32 old_speed_hz = st->adis.spi->max_speed_hz;
> +	void *buffer;
> +	int ret;
> +
> +	if (!adis->buffer)
> +		return -ENOMEM;
> +
> +	if (!(st->variant->flags & ADIS16400_NO_BURST) &&
> +		st->adis.spi->max_speed_hz > ADIS16400_SPI_BURST) {
> +		st->adis.spi->max_speed_hz = ADIS16400_SPI_BURST;
> +		spi_setup(st->adis.spi);
> +	}
> +
> +	ret = spi_sync(adis->spi, &adis->msg);
> +	if (ret)
> +		dev_err(&adis->spi->dev, "Failed to read data: %d\n", ret);
> +
> +	if (!(st->variant->flags & ADIS16400_NO_BURST)) {
> +		st->adis.spi->max_speed_hz = old_speed_hz;
> +		spi_setup(st->adis.spi);
> +	}
> +
> +	if (st->variant->flags & ADIS16400_BURST_DIAG_STAT)
> +		buffer = adis->buffer + sizeof(u16);
> +	else
> +		buffer = adis->buffer;
> +
> +	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
> +		pf->timestamp);
> +
> +	iio_trigger_notify_done(indio_dev->trig);
> +
> +	return IRQ_HANDLED;
> +}
> +#else
> +#define adis16400_trigger_handler	NULL
> +#endif /* IS_ENABLED(CONFIG_IIO_BUFFER) */
> +
>  #define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \
>  	.type = IIO_VOLTAGE, \
>  	.indexed = 1, \
diff mbox series

Patch

diff --git a/drivers/iio/imu/adis16400.h b/drivers/iio/imu/adis16400.h
index 73b189c1c0fb..93b6c0c41fdd 100644
--- a/drivers/iio/imu/adis16400.h
+++ b/drivers/iio/imu/adis16400.h
@@ -203,12 +203,10 @@  ssize_t adis16400_read_data_from_ring(struct device *dev,
 
 int adis16400_update_scan_mode(struct iio_dev *indio_dev,
 	const unsigned long *scan_mask);
-irqreturn_t adis16400_trigger_handler(int irq, void *p);
 
 #else /* CONFIG_IIO_BUFFER */
 
 #define adis16400_update_scan_mode NULL
-#define adis16400_trigger_handler NULL
 
 #endif /* CONFIG_IIO_BUFFER */
 
diff --git a/drivers/iio/imu/adis16400_buffer.c b/drivers/iio/imu/adis16400_buffer.c
index e70a5339acb1..268349eb51c7 100644
--- a/drivers/iio/imu/adis16400_buffer.c
+++ b/drivers/iio/imu/adis16400_buffer.c
@@ -58,44 +58,3 @@  int adis16400_update_scan_mode(struct iio_dev *indio_dev,
 
 	return 0;
 }
-
-irqreturn_t adis16400_trigger_handler(int irq, void *p)
-{
-	struct iio_poll_func *pf = p;
-	struct iio_dev *indio_dev = pf->indio_dev;
-	struct adis16400_state *st = iio_priv(indio_dev);
-	struct adis *adis = &st->adis;
-	u32 old_speed_hz = st->adis.spi->max_speed_hz;
-	void *buffer;
-	int ret;
-
-	if (!adis->buffer)
-		return -ENOMEM;
-
-	if (!(st->variant->flags & ADIS16400_NO_BURST) &&
-		st->adis.spi->max_speed_hz > ADIS16400_SPI_BURST) {
-		st->adis.spi->max_speed_hz = ADIS16400_SPI_BURST;
-		spi_setup(st->adis.spi);
-	}
-
-	ret = spi_sync(adis->spi, &adis->msg);
-	if (ret)
-		dev_err(&adis->spi->dev, "Failed to read data: %d\n", ret);
-
-	if (!(st->variant->flags & ADIS16400_NO_BURST)) {
-		st->adis.spi->max_speed_hz = old_speed_hz;
-		spi_setup(st->adis.spi);
-	}
-
-	if (st->variant->flags & ADIS16400_BURST_DIAG_STAT)
-		buffer = adis->buffer + sizeof(u16);
-	else
-		buffer = adis->buffer;
-
-	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
-		pf->timestamp);
-
-	iio_trigger_notify_done(indio_dev->trig);
-
-	return IRQ_HANDLED;
-}
diff --git a/drivers/iio/imu/adis16400_core.c b/drivers/iio/imu/adis16400_core.c
index 9b697d35dbef..34d52863377a 100644
--- a/drivers/iio/imu/adis16400_core.c
+++ b/drivers/iio/imu/adis16400_core.c
@@ -31,6 +31,7 @@ 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
+#include <linux/iio/trigger_consumer.h>
 
 #include "adis16400.h"
 
@@ -465,6 +466,51 @@  static int adis16400_read_raw(struct iio_dev *indio_dev,
 	}
 }
 
+#if IS_ENABLED(CONFIG_IIO_BUFFER)
+static irqreturn_t adis16400_trigger_handler(int irq, void *p)
+{
+	struct iio_poll_func *pf = p;
+	struct iio_dev *indio_dev = pf->indio_dev;
+	struct adis16400_state *st = iio_priv(indio_dev);
+	struct adis *adis = &st->adis;
+	u32 old_speed_hz = st->adis.spi->max_speed_hz;
+	void *buffer;
+	int ret;
+
+	if (!adis->buffer)
+		return -ENOMEM;
+
+	if (!(st->variant->flags & ADIS16400_NO_BURST) &&
+		st->adis.spi->max_speed_hz > ADIS16400_SPI_BURST) {
+		st->adis.spi->max_speed_hz = ADIS16400_SPI_BURST;
+		spi_setup(st->adis.spi);
+	}
+
+	ret = spi_sync(adis->spi, &adis->msg);
+	if (ret)
+		dev_err(&adis->spi->dev, "Failed to read data: %d\n", ret);
+
+	if (!(st->variant->flags & ADIS16400_NO_BURST)) {
+		st->adis.spi->max_speed_hz = old_speed_hz;
+		spi_setup(st->adis.spi);
+	}
+
+	if (st->variant->flags & ADIS16400_BURST_DIAG_STAT)
+		buffer = adis->buffer + sizeof(u16);
+	else
+		buffer = adis->buffer;
+
+	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
+		pf->timestamp);
+
+	iio_trigger_notify_done(indio_dev->trig);
+
+	return IRQ_HANDLED;
+}
+#else
+#define adis16400_trigger_handler	NULL
+#endif /* IS_ENABLED(CONFIG_IIO_BUFFER) */
+
 #define ADIS16400_VOLTAGE_CHAN(addr, bits, name, si, chn) { \
 	.type = IIO_VOLTAGE, \
 	.indexed = 1, \