iio:st_sensors more fixes when !IIO_CONFIG_TRIGGER
Jonathan Cameron
maintainercover iio:st_sensors more fixes when !IIO_CONFIG_TRIGGER
Here is how I would suggest dealing with the issues pointed out by Randy when buildling without trigger support.
Jonathan
Jonathan Cameron (2):
iio:triggers Protect functions in triggers.h from use when not
compiled
iio:st_sensors fix build when !CONFIG_IIO_TRIGGER
drivers/iio/accel/st_accel_core.c | 9 +++++++-- drivers/iio/accel/st_accel_i2c.c | 1 - drivers/iio/accel/st_accel_spi.c | 1 - drivers/iio/gyro/st_gyro_core.c | 9 +++++++-- drivers/iio/gyro/st_gyro_i2c.c | 1 - drivers/iio/gyro/st_gyro_spi.c | 1 - drivers/iio/magnetometer/st_magn_core.c | 1 - drivers/iio/magnetometer/st_magn_i2c.c | 1 - drivers/iio/magnetometer/st_magn_spi.c | 1 - include/linux/iio/trigger.h | 5 +++++ 10 files changed, 19 insertions(+), 11 deletions(-)
Signature · 1 line
1.8.1.1
Jonathan Cameron
maintainerPATCH 1/2 iio:triggers Protect functions in triggers.h from use when not compiled
Also include a couple of forward defs of struct iio_trigger and struct iio_trigger_ops to avoid doing this in each driver.
--- include/linux/iio/trigger.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/iio/trigger.h +5 -0
@@ -12,6 +12,7 @@#ifndef _IIO_TRIGGER_H_#define _IIO_TRIGGER_H_ +#ifdef CONFIG_IIO_TRIGGER struct iio_subirq {bool enabled; };
@@ -117,4 +118,8 @@ irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private); __printf(1, 2) struct iio_trigger *iio_trigger_alloc(const char *fmt, ...);void iio_trigger_free (struct iio_trigger *trig); +#else +struct iio_trigger ; +struct iio_trigger_ops ; +#endif #endif /* _IIO_TRIGGER_H_ */
Signature · 1 line
1.8.1.1
Jonathan Cameron
maintainerPATCH 2/2 iio:st_sensors fix build when !CONFIG_IIO_TRIGGER
In reply to Jonathan CameronPartly a case of removing unused headers and partly a case of ifdefing out the iio_trigger_ops structures. This has come about because of an 'unusual' separation of code in this driver.
--- drivers/iio/accel/st_accel_core.c | 9 +++++++-- drivers/iio/accel/st_accel_i2c.c | 1 - drivers/iio/accel/st_accel_spi.c | 1 - drivers/iio/gyro/st_gyro_core.c | 9 +++++++-- drivers/iio/gyro/st_gyro_i2c.c | 1 - drivers/iio/gyro/st_gyro_spi.c | 1 - drivers/iio/magnetometer/st_magn_core.c | 1 - drivers/iio/magnetometer/st_magn_i2c.c | 1 - drivers/iio/magnetometer/st_magn_spi.c | 1 - 9 files changed, 14 insertions(+), 11 deletions(-)
drivers/iio/accel/st_accel_core.c +7 -2
@@ -20,7 +20,7 @@#include <linux/irq.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h>
@@ -419,10 +419,15 @@ static const struct iio_info accel_info = { .write_raw = &st_accel_write_raw, }; +#ifdef CONFIG_IIO_TRIGGER static const struct iio_trigger_ops st_accel_trigger_ops = { .owner =THIS_MODULE , .set_trigger_state =ST_ACCEL_TRIGGER_SET_STATE , }; +#define ST_ACCEL_TRIGGER_OPS (&st_accel_trigger_ops) +#else +#define ST_ACCEL_TRIGGER_OPS NULL +#endif int st_accel_common_probe (struct iio_dev *indio_dev) {
@@ -455,7 +460,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev) goto st_accel_common_probe_error; err =st_sensors_allocate_trigger (indio_dev, - &st_accel_trigger_ops); +ST_ACCEL_TRIGGER_OPS );if (err <0 ) goto st_accel_probe_trigger_error; }
drivers/iio/accel/st_accel_i2c.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h>
drivers/iio/accel/st_accel_spi.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h>
drivers/iio/gyro/st_gyro_core.c +7 -2
@@ -21,7 +21,7 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h>
@@ -287,10 +287,15 @@ static const struct iio_info gyro_info = { .write_raw = &st_gyro_write_raw, }; +#ifdef CONFIG_IIO_TRIGGER static const struct iio_trigger_ops st_gyro_trigger_ops = { .owner =THIS_MODULE , .set_trigger_state =ST_GYRO_TRIGGER_SET_STATE , }; +#define ST_GYRO_TRIGGER_OPS (&st_gyro_trigger_ops) +#else +#define ST_GYRO_TRIGGER_OPS NULL +#endif int st_gyro_common_probe (struct iio_dev *indio_dev) {
@@ -323,7 +328,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) goto st_gyro_common_probe_error; err =st_sensors_allocate_trigger (indio_dev, - &st_gyro_trigger_ops); +ST_GYRO_TRIGGER_OPS );if (err <0 ) goto st_gyro_probe_trigger_error; }
drivers/iio/gyro/st_gyro_i2c.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h>
drivers/iio/gyro/st_gyro_spi.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h>
drivers/iio/magnetometer/st_magn_core.c +0 -1
@@ -21,7 +21,6 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h>
drivers/iio/magnetometer/st_magn_i2c.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h>
drivers/iio/magnetometer/st_magn_spi.c +0 -1
@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h>
Signature · 1 line
1.8.1.1
Re: [PATCH 2/2] iio:st_sensors fix build when !CONFIG_IIO_TRIGGER
Quoted 4 lines
Partly a case of removing unused headers and partly a case of ifdefing out the
iio_trigger_opsstructures. This has come about because of an 'unusual' separation of code in this driver.
Ok for me is ok.
Thanks Jonathan & Randy
Quoted 181 lines
Signed-off-by Jonathan Cameron <[email protected]>Reported-by Randy Dunlap <[email protected]>--- drivers/iio/accel/st_accel_core.c | 9 +++++++-- drivers/iio/accel/st_accel_i2c.c | 1 - drivers/iio/accel/st_accel_spi.c | 1 - drivers/iio/gyro/st_gyro_core.c | 9 +++++++-- drivers/iio/gyro/st_gyro_i2c.c | 1 - drivers/iio/gyro/st_gyro_spi.c | 1 - drivers/iio/magnetometer/st_magn_core.c | 1 - drivers/iio/magnetometer/st_magn_i2c.c | 1 - drivers/iio/magnetometer/st_magn_spi.c | 1 - 9 files changed, 14 insertions(+), 11 deletions(-)drivers/iio/accel/st_accel_core.c +7
-2@@ -20,7 +20,7 @@#include <linux/irq.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> @@ -419,10 +419,15 @@ static const struct iio_info accel_info = { .write_raw = &st_accel_write_raw, }; +#ifdef CONFIG_IIO_TRIGGER static const struct iio_trigger_ops st_accel_trigger_ops = { .owner =THIS_MODULE , .set_trigger_state =ST_ACCEL_TRIGGER_SET_STATE , }; +#define ST_ACCEL_TRIGGER_OPS (&st_accel_trigger_ops) +#else +#define ST_ACCEL_TRIGGER_OPS NULL +#endif int st_accel_common_probe (struct iio_dev *indio_dev) {@@ -455,7 +460,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev) goto st_accel_common_probe_error; err =st_sensors_allocate_trigger (indio_dev, - &st_accel_trigger_ops); +ST_ACCEL_TRIGGER_OPS );if (err <0 ) goto st_accel_probe_trigger_error; }drivers/iio/accel/st_accel_i2c.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h> drivers/iio/accel/st_accel_spi.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h> drivers/iio/gyro/st_gyro_core.c +7
-2@@ -21,7 +21,7 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> @@ -287,10 +287,15 @@ static const struct iio_info gyro_info = { .write_raw = &st_gyro_write_raw, }; +#ifdef CONFIG_IIO_TRIGGER static const struct iio_trigger_ops st_gyro_trigger_ops = { .owner =THIS_MODULE , .set_trigger_state =ST_GYRO_TRIGGER_SET_STATE , }; +#define ST_GYRO_TRIGGER_OPS (&st_gyro_trigger_ops) +#else +#define ST_GYRO_TRIGGER_OPS NULL +#endif int st_gyro_common_probe (struct iio_dev *indio_dev) {@@ -323,7 +328,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) goto st_gyro_common_probe_error; err =st_sensors_allocate_trigger (indio_dev, - &st_gyro_trigger_ops); +ST_GYRO_TRIGGER_OPS );if (err <0 ) goto st_gyro_probe_trigger_error; }drivers/iio/gyro/st_gyro_i2c.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h> drivers/iio/gyro/st_gyro_spi.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h> drivers/iio/magnetometer/st_magn_core.c +0
-1@@ -21,7 +21,6 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> drivers/iio/magnetometer/st_magn_i2c.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h> drivers/iio/magnetometer/st_magn_spi.c +0
-2@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h> --1.8.1.1
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Jonathan Cameron
maintainerRe: [PATCH 2/2] iio:st_sensors fix build when !CONFIG_IIO_TRIGGER
Quoted 8 lines · Denis Ciocca
Quoted 4 lines
Partly a case of removing unused headers and partly a case of ifdefing out the
iio_trigger_opsstructures. This has come about because of an 'unusual' separation of code in this driver.Ok for me is ok.
Thanks Jonathan & Randy
I'll take that as an
Acked-by:
Quoted 189 lines
Quoted 180 lines
Signed-off-by Jonathan Cameron <[email protected]>Reported-by Randy Dunlap <[email protected]>--- drivers/iio/accel/st_accel_core.c | 9 +++++++-- drivers/iio/accel/st_accel_i2c.c | 1 - drivers/iio/accel/st_accel_spi.c | 1 - drivers/iio/gyro/st_gyro_core.c | 9 +++++++-- drivers/iio/gyro/st_gyro_i2c.c | 1 - drivers/iio/gyro/st_gyro_spi.c | 1 - drivers/iio/magnetometer/st_magn_core.c | 1 - drivers/iio/magnetometer/st_magn_i2c.c | 1 - drivers/iio/magnetometer/st_magn_spi.c | 1 - 9 files changed, 14 insertions(+), 11 deletions(-)drivers/iio/accel/st_accel_core.c +7
-2@@ -20,7 +20,7 @@#include <linux/irq.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> @@ -419,10 +419,15 @@ static const struct iio_info accel_info = { .write_raw = &st_accel_write_raw, }; +#ifdef CONFIG_IIO_TRIGGER static const struct iio_trigger_ops st_accel_trigger_ops = { .owner =THIS_MODULE , .set_trigger_state =ST_ACCEL_TRIGGER_SET_STATE , }; +#define ST_ACCEL_TRIGGER_OPS (&st_accel_trigger_ops) +#else +#define ST_ACCEL_TRIGGER_OPS NULL +#endif int st_accel_common_probe (struct iio_dev *indio_dev) {@@ -455,7 +460,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev) goto st_accel_common_probe_error; err =st_sensors_allocate_trigger (indio_dev, - &st_accel_trigger_ops); +ST_ACCEL_TRIGGER_OPS );if (err <0 ) goto st_accel_probe_trigger_error; }drivers/iio/accel/st_accel_i2c.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h> drivers/iio/accel/st_accel_spi.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h> drivers/iio/gyro/st_gyro_core.c +7
-2@@ -21,7 +21,7 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> +#include <linux/iio/trigger.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> @@ -287,10 +287,15 @@ static const struct iio_info gyro_info = { .write_raw = &st_gyro_write_raw, }; +#ifdef CONFIG_IIO_TRIGGER static const struct iio_trigger_ops st_gyro_trigger_ops = { .owner =THIS_MODULE , .set_trigger_state =ST_GYRO_TRIGGER_SET_STATE , }; +#define ST_GYRO_TRIGGER_OPS (&st_gyro_trigger_ops) +#else +#define ST_GYRO_TRIGGER_OPS NULL +#endif int st_gyro_common_probe (struct iio_dev *indio_dev) {@@ -323,7 +328,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev) goto st_gyro_common_probe_error; err =st_sensors_allocate_trigger (indio_dev, - &st_gyro_trigger_ops); +ST_GYRO_TRIGGER_OPS );if (err <0 ) goto st_gyro_probe_trigger_error; }drivers/iio/gyro/st_gyro_i2c.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h> drivers/iio/gyro/st_gyro_spi.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h> drivers/iio/magnetometer/st_magn_core.c +0
-1@@ -21,7 +21,6 @@#include <linux/delay.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/iio/trigger_consumer.h> #include <linux/iio/buffer.h> #include <linux/iio/common/st_sensors.h> drivers/iio/magnetometer/st_magn_i2c.c +0
-1@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_i2c.h> drivers/iio/magnetometer/st_magn_spi.c +0
-2@@ -13,7 +13,6 @@#include <linux/slab.h> #include <linux/spi/spi.h> #include <linux/iio/iio.h> -#include <linux/iio/trigger.h> #include <linux/iio/common/st_sensors.h> #include <linux/iio/common/st_sensors_spi.h> --1.8.1.1
Quoted 4 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 3 lines · Jonathan Cameron
Here is how I would suggest dealing with the issues pointed out by Randy when buildling without trigger support.
Applied to togreg branch of iio.git
Quoted 19 lines
Jonathan
Jonathan Cameron (2):
iio:triggers Protect functions intriggers.hfrom use when not
compiled
iio:st_sensors fix build when !CONFIG_IIO_TRIGGERdrivers/iio/accel/st_accel_core.c | 9 +++++++-- drivers/iio/accel/st_accel_i2c.c | 1 - drivers/iio/accel/st_accel_spi.c | 1 - drivers/iio/gyro/st_gyro_core.c | 9 +++++++-- drivers/iio/gyro/st_gyro_i2c.c | 1 - drivers/iio/gyro/st_gyro_spi.c | 1 - drivers/iio/magnetometer/st_magn_core.c | 1 - drivers/iio/magnetometer/st_magn_i2c.c | 1 - drivers/iio/magnetometer/st_magn_spi.c | 1 - include/linux/iio/trigger.h | 5 +++++ 10 files changed, 19 insertions(+), 11 deletions(-)