On 10/11/14 12:45, Daniel Baluta wrote:
> From: Irina Tirdea <irina.tirdea@xxxxxxxxx>
>
> For some events (e.g.: step detector) a direction does not make sense.
>
> Add IIO_EV_DIR_NONE to be used with such events and generate sysfs event
> attributes that do not contain direction.
>
> Signed-off-by: Irina Tirdea <irina.tirdea@xxxxxxxxx>
> Signed-off-by: Daniel Baluta <daniel.baluta@xxxxxxxxx>
Applied -> iio.git:togreg, pushed->iio.git:testing.
> ---
> drivers/iio/industrialio-event.c | 12 +++++++++---
> include/linux/iio/types.h | 1 +
> 2 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
> index 0c1e37e..1290290 100644
> --- a/drivers/iio/industrialio-event.c
> +++ b/drivers/iio/industrialio-event.c
> @@ -327,9 +327,15 @@ static int iio_device_add_event(struct iio_dev *indio_dev,
> for_each_set_bit(i, mask, sizeof(*mask)*8) {
> if (i >= ARRAY_SIZE(iio_ev_info_text))
> return -EINVAL;
> - postfix = kasprintf(GFP_KERNEL, "%s_%s_%s",
> - iio_ev_type_text[type], iio_ev_dir_text[dir],
> - iio_ev_info_text[i]);
> + if (dir != IIO_EV_DIR_NONE)
> + postfix = kasprintf(GFP_KERNEL, "%s_%s_%s",
> + iio_ev_type_text[type],
> + iio_ev_dir_text[dir],
> + iio_ev_info_text[i]);
> + else
> + postfix = kasprintf(GFP_KERNEL, "%s_%s",
> + iio_ev_type_text[type],
> + iio_ev_info_text[i]);
> if (postfix == NULL)
> return -ENOMEM;
>
> diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
> index b3a241d..52cb532 100644
> --- a/include/linux/iio/types.h
> +++ b/include/linux/iio/types.h
> @@ -86,6 +86,7 @@ enum iio_event_direction {
> IIO_EV_DIR_EITHER,
> IIO_EV_DIR_RISING,
> IIO_EV_DIR_FALLING,
> + IIO_EV_DIR_NONE,
> };
>
> #define IIO_VAL_INT 1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
