[RESEND PATCH 4/4] iio: st_common: use standard trigger suffix

[RESEND PATCH 4/4] iio: st_common: use standard trigger suffix

[Linus Walleij]

The triggers from ST sensors are named <iio_device_name>-trigger
instead of the standard <iio_device_name>-dev<iio_dev_id> as
used by most and also in the iio-tools. Change this to match
the norm.

After this I can do tests with generic_buffer -n <dev_name>
without having to manually specify the trigger with the -t
option.

Cc: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/iio/common/st_sensors/st_sensors_trigger.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index 3e907040c2c7..3c0aa17d753f 100644
--- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
@@ -24,7 +24,8 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
 	int err;
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
-	sdata->trig = iio_trigger_alloc("%s-trigger", indio_dev->name);
+	sdata->trig = iio_trigger_alloc("%s-dev%d",
+					indio_dev->name, indio_dev->id);
 	if (sdata->trig == NULL) {
 		err = -ENOMEM;
 		dev_err(&indio_dev->dev, "failed to allocate iio trigger.\n");
-- 
2.4.3

Re: [RESEND PATCH 4/4] iio: st_common: use standard trigger suffix

[Jonathan Cameron]

On 15/09/15 08:49, Linus Walleij wrote:
> The triggers from ST sensors are named <iio_device_name>-trigger
> instead of the standard <iio_device_name>-dev<iio_dev_id> as
> used by most and also in the iio-tools. Change this to match
> the norm.
> 
> After this I can do tests with generic_buffer -n <dev_name>
> without having to manually specify the trigger with the -t
> option.
> 
> Cc: Denis Ciocca <denis.ciocca@st.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Sorry, I never replied to your last email about this one.  Have
done so now as better to keep discussion in that thread than
start a new one.

Jonathan
> ---
>  drivers/iio/common/st_sensors/st_sensors_trigger.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> index 3e907040c2c7..3c0aa17d753f 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> @@ -24,7 +24,8 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev,
>  	int err;
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
> -	sdata->trig = iio_trigger_alloc("%s-trigger", indio_dev->name);
> +	sdata->trig = iio_trigger_alloc("%s-dev%d",
> +					indio_dev->name, indio_dev->id);
>  	if (sdata->trig == NULL) {
>  		err = -ENOMEM;
>  		dev_err(&indio_dev->dev, "failed to allocate iio trigger.\n");
>