From 6c5c0f3b86aefe4729bbf7575501222c345c0354 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Mon, 22 Oct 2012 08:57:00 +0100 Subject: [PATCH] --- yaml --- r: 337988 b: refs/heads/master c: 69bcd3bf40228239db91b075f56f9ba511f0bfe1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/common/hid-sensors/Kconfig | 2 +- trunk/drivers/iio/common/hid-sensors/hid-sensor-trigger.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 690216094a76..0f4d98d98836 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acf1cf6a1c0966ef64a73083ca985605a12b032d +refs/heads/master: 69bcd3bf40228239db91b075f56f9ba511f0bfe1 diff --git a/trunk/drivers/iio/common/hid-sensors/Kconfig b/trunk/drivers/iio/common/hid-sensors/Kconfig index 8e63d81d652a..ae10778da7aa 100644 --- a/trunk/drivers/iio/common/hid-sensors/Kconfig +++ b/trunk/drivers/iio/common/hid-sensors/Kconfig @@ -15,7 +15,7 @@ config HID_SENSOR_IIO_COMMON attributes. config HID_SENSOR_ENUM_BASE_QUIRKS - tristate "ENUM base quirks for HID Sensor IIO drivers" + bool "ENUM base quirks for HID Sensor IIO drivers" depends on HID_SENSOR_IIO_COMMON help Say yes here to build support for sensor hub FW using diff --git a/trunk/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/trunk/drivers/iio/common/hid-sensors/hid-sensor-trigger.c index d4b790d18efb..d60198a6ca29 100644 --- a/trunk/drivers/iio/common/hid-sensors/hid-sensor-trigger.c +++ b/trunk/drivers/iio/common/hid-sensors/hid-sensor-trigger.c @@ -36,10 +36,8 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig, int state_val; state_val = state ? 1 : 0; -#if (defined CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS) || \ - (defined CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS_MODULE) - ++state_val; -#endif + if (IS_ENABLED(CONFIG_HID_SENSOR_ENUM_BASE_QUIRKS)) + ++state_val; st->data_ready = state; sensor_hub_set_feature(st->hsdev, st->power_state.report_id, st->power_state.index,