Skip to contentSkip to conversation

iio: Fix build error seen if IIO_TRIGGER is defined but IIO_BUFFER is not

PATCH Applied Guenter Roeck 3 participants 3 messages Mar 1, 2013 – Mar 2, 2013 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: Fix build error seen if IIO_TRIGGER is defined but IIO_BUFFER is not

If CONFIG_IIO_TRIGGER is defined but CONFIG_IIO_BUFFER is not, the following build error is seen.

drivers/iio/common/st_sensors/st_sensors_trigger.c:21:5: error:
redefinition of ‘st_sensors_allocate_trigger’
In file included from drivers/iio/common/st_sensors/st_sensors_trigger.c:18:0:
include/linux/iio/common/st_sensors.h:239:19: note: previous definition of ‘st_sensors_allocate_trigger’ was here drivers/iio/common/st_sensors/st_sensors_trigger.c:65:6: error:
redefinition of ‘st_sensors_deallocate_trigger’
In file included from drivers/iio/common/st_sensors/st_sensors_trigger.c:18:0:
include/linux/iio/common/st_sensors.h:244:20: note: previous definition of ‘st_sensors_deallocate_trigger’ was here

This occurs because st_sensors_deallocate_trigger is built if CONFIG_IIO_TRIGGER is defined, but the dummy function is compiled if CONFIG_IIO_BUFFER is defined.

---
 include/linux/iio/common/st_sensors.h |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
include/linux/iio/common/st_sensors.h +6 -3
index 1f86a97..8bd12be 100644
@@ -227,14 +227,17 @@ struct st_sensor_data {
 };
 
 #ifdef CONFIG_IIO_BUFFER
+irqreturn_t st_sensors_trigger_handler(int irq, void *p);
+
+int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf);
+#endif
+
+#ifdef CONFIG_IIO_TRIGGER
 int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
 				const struct iio_trigger_ops *trigger_ops);
 
 void st_sensors_deallocate_trigger(struct iio_dev *indio_dev);
 
-irqreturn_t st_sensors_trigger_handler(int irq, void *p);
-
-int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf);
 #else
 static inline int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
 				const struct iio_trigger_ops *trigger_ops)
Signature · 1 line
1.7.9.7
#1 lore raw

T2sgVGhhbmtzLg0KDQpBY2tlZC1ieTogRGVuaXMgQ2lvY2NhIDxkZW5pcy5jaW9jY2FAc3QuY29t Pg0KDQoNCkRlbmlzDQoNCg0KT24gMDMvMDEvMjAxMyAwNDo1NyBQTSwgR3VlbnRlciBSb2VjayB3 cm90ZToNCj4gSWYgQ09ORklHX0lJT19UUklHR0VSIGlzIGRlZmluZWQgYnV0IENPTkZJR19JSU9f QlVGRkVSIGlzIG5vdCwgdGhlIGZvbGxvd2luZw0KPiBidWlsZCBlcnJvciBpcyBzZWVuLg0KPg0K PiBkcml2ZXJzL2lpby9jb21tb24vc3Rfc2Vuc29ycy9zdF9zZW5zb3JzX3RyaWdnZXIuYzoyMTo1 OiBlcnJvcjoNCj4gcmVkZWZpbml0aW9uIG9mIOKAmHN0X3NlbnNvcnNfYWxsb2NhdGVfdHJpZ2dl cuKAmQ0KPiBJbiBmaWxlIGluY2x1ZGVkIGZyb20NCj4gZHJpdmVycy9paW8vY29tbW9uL3N0X3Nl bnNvcnMvc3Rfc2Vuc29yc190cmlnZ2VyLmM6MTg6MDoNCj4gaW5jbHVkZS9saW51eC9paW8vY29t bW9uL3N0X3NlbnNvcnMuaDoyMzk6MTk6IG5vdGU6IHByZXZpb3VzDQo+IGRlZmluaXRpb24gb2Yg 4oCYc3Rfc2Vuc29yc19hbGxvY2F0ZV90cmlnZ2Vy4oCZIHdhcyBoZXJlDQo+IGRyaXZlcnMvaWlv L2NvbW1vbi9zdF9zZW5zb3JzL3N0X3NlbnNvcnNfdHJpZ2dlci5jOjY1OjY6IGVycm9yOg0KPiBy ZWRlZmluaXRpb24gb2Yg4oCYc3Rfc2Vuc29yc19kZWFsbG9jYXRlX3RyaWdnZXLigJkNCj4gSW4g ZmlsZSBpbmNsdWRlZCBmcm9tDQo+IGRyaXZlcnMvaWlvL2NvbW1vbi9zdF9zZW5zb3JzL3N0X3Nl bnNvcnNfdHJpZ2dlci5jOjE4OjA6DQo+IGluY2x1ZGUvbGludXgvaWlvL2NvbW1vbi9zdF9zZW5z b3JzLmg6MjQ0OjIwOiBub3RlOiBwcmV2aW91cw0KPiBkZWZpbml0aW9uIG9mIOKAmHN0X3NlbnNv cnNfZGVhbGxvY2F0ZV90cmlnZ2Vy4oCZIHdhcyBoZXJlDQo+DQo+IFRoaXMgb2NjdXJzIGJlY2F1 c2Ugc3Rfc2Vuc29yc19kZWFsbG9jYXRlX3RyaWdnZXIgaXMgYnVpbHQgaWYgQ09ORklHX0lJT19U UklHR0VSDQo+IGlzIGRlZmluZWQsIGJ1dCB0aGUgZHVtbXkgZnVuY3Rpb24gaXMgY29tcGlsZWQg aWYgQ09ORklHX0lJT19CVUZGRVIgaXMgZGVmaW5lZC4NCj4NCj4gU2lnbmVkLW9mZi1ieTogR3Vl bnRlciBSb2VjayA8bGludXhAcm9lY2stdXMubmV0Pg0KPiAtLS0NCj4gICBpbmNsdWRlL2xpbnV4 L2lpby9jb21tb24vc3Rfc2Vuc29ycy5oIHwgICAgOSArKysrKystLS0NCj4gICAxIGZpbGUgY2hh bmdlZCwgNiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQ0KPg0KPiBkaWZmIC0tZ2l0IGEv aW5jbHVkZS9saW51eC9paW8vY29tbW9uL3N0X3NlbnNvcnMuaCBiL2luY2x1ZGUvbGludXgvaWlv L2NvbW1vbi9zdF9zZW5zb3JzLmgNCj4gaW5kZXggMWY4NmE5Ny4uOGJkMTJiZSAxMDA2NDQNCj4g LS0tIGEvaW5jbHVkZS9saW51eC9paW8vY29tbW9uL3N0X3NlbnNvcnMuaA0KPiArKysgYi9pbmNs dWRlL2xpbnV4L2lpby9jb21tb24vc3Rfc2Vuc29ycy5oDQo+IEBAIC0yMjcsMTQgKzIyNywxNyBA QCBzdHJ1Y3Qgc3Rfc2Vuc29yX2RhdGEgew0KPiAgIH07DQo+DQo+ICAgI2lmZGVmIENPTkZJR19J SU9fQlVGRkVSDQo+ICtpcnFyZXR1cm5fdCBzdF9zZW5zb3JzX3RyaWdnZXJfaGFuZGxlcihpbnQg aXJxLCB2b2lkICpwKTsNCj4gKw0KPiAraW50IHN0X3NlbnNvcnNfZ2V0X2J1ZmZlcl9lbGVtZW50 KHN0cnVjdCBpaW9fZGV2ICppbmRpb19kZXYsIHU4ICpidWYpOw0KPiArI2VuZGlmDQo+ICsNCj4g KyNpZmRlZiBDT05GSUdfSUlPX1RSSUdHRVINCj4gICBpbnQgc3Rfc2Vuc29yc19hbGxvY2F0ZV90 cmlnZ2VyKHN0cnVjdCBpaW9fZGV2ICppbmRpb19kZXYsDQo+ICAgCQkJCWNvbnN0IHN0cnVjdCBp aW9fdHJpZ2dlcl9vcHMgKnRyaWdnZXJfb3BzKTsNCj4NCj4gICB2b2lkIHN0X3NlbnNvcnNfZGVh bGxvY2F0ZV90cmlnZ2VyKHN0cnVjdCBpaW9fZGV2ICppbmRpb19kZXYpOw0KPg0KPiAtaXJxcmV0 dXJuX3Qgc3Rfc2Vuc29yc190cmlnZ2VyX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqcCk7DQo+IC0N Cj4gLWludCBzdF9zZW5zb3JzX2dldF9idWZmZXJfZWxlbWVudChzdHJ1Y3QgaWlvX2RldiAqaW5k aW9fZGV2LCB1OCAqYnVmKTsNCj4gICAjZWxzZQ0KPiAgIHN0YXRpYyBpbmxpbmUgaW50IHN0X3Nl bnNvcnNfYWxsb2NhdGVfdHJpZ2dlcihzdHJ1Y3QgaWlvX2RldiAqaW5kaW9fZGV2LA0KPiAgIAkJ CQljb25zdCBzdHJ1Y3QgaWlvX3RyaWdnZXJfb3BzICp0cmlnZ2VyX29wcykNCj4=

maintainer Applied
#2 lore raw
Quoted 3 lines · Denis CIOCCA

Ok Thanks.

Applied to fixes-togreg branch of iio.git

Thanks,

Quoted 57 lines

Denis

Quoted 50 lines · Guenter Roeck

If CONFIG_IIO_TRIGGER is defined but CONFIG_IIO_BUFFER is not, the following build error is seen.

drivers/iio/common/st_sensors/st_sensors_trigger.c:21:5: error:
redefinition of ‘st_sensors_allocate_trigger’
In file included from drivers/iio/common/st_sensors/st_sensors_trigger.c:18:0:
include/linux/iio/common/st_sensors.h:239:19: note: previous definition of ‘st_sensors_allocate_trigger’ was here drivers/iio/common/st_sensors/st_sensors_trigger.c:65:6: error:
redefinition of ‘st_sensors_deallocate_trigger’
In file included from drivers/iio/common/st_sensors/st_sensors_trigger.c:18:0:
include/linux/iio/common/st_sensors.h:244:20: note: previous definition of ‘st_sensors_deallocate_trigger’ was here

This occurs because st_sensors_deallocate_trigger is built if CONFIG_IIO_TRIGGER is defined, but the dummy function is compiled if CONFIG_IIO_BUFFER is defined.

---
  include/linux/iio/common/st_sensors.h |    9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
include/linux/iio/common/st_sensors.h +6 -3
index 1f86a97..8bd12be 100644
@@ -227,14 +227,17 @@ struct st_sensor_data {
  };
 
  #ifdef CONFIG_IIO_BUFFER
+irqreturn_t st_sensors_trigger_handler(int irq, void *p);
+
+int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf);
+#endif
+
+#ifdef CONFIG_IIO_TRIGGER
  int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
  				const struct iio_trigger_ops *trigger_ops);
 
  void st_sensors_deallocate_trigger(struct iio_dev *indio_dev);
 
-irqreturn_t st_sensors_trigger_handler(int irq, void *p);
-
-int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf);
  #else
  static inline int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
  				const struct iio_trigger_ops *trigger_ops)