diff mbox series

[v4,2/5] iio: trigger: Add simple trigger_validation helper

Message ID dab917aa8f2442ad10aa2a266395edd3cd7ce1d7.1683105758.git.mazziesaccount@gmail.com
State New
Headers
Series Support ROHM BU27008 RGB sensor |

Commit Message

Matti Vaittinen May 3, 2023, 9:48 a.m. UTC 
  Some triggers can only be attached to the IIO device that corresponds to
the same physical device. Implement generic helper which can be used as
a validate_trigger callback for such devices.

Suggested-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>

---
Revision history
v2: => v3:
 - Fix title (space after iio:)
v2: New patch
---
 drivers/iio/industrialio-trigger.c | 22 +++++++++++++++++++++-
 include/linux/iio/trigger.h        |  1 +
 2 files changed, 22 insertions(+), 1 deletion(-)

Comments

Jonathan Cameron May 7, 2023, 2:34 p.m. UTC | #1 
On Wed, 3 May 2023 12:48:57 +0300
Matti Vaittinen <mazziesaccount@gmail.com> wrote:

> Some triggers can only be attached to the IIO device that corresponds to
> the same physical device. Implement generic helper which can be used as
> a validate_trigger callback for such devices.
> 
> Suggested-by: Jonathan Cameron <jic23@kernel.org>
> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
> 

Noticed a trivial capitalisation issue inline.

Jonathan

> ---
> Revision history
> v2: => v3:
>  - Fix title (space after iio:)
> v2: New patch
> ---
>  drivers/iio/industrialio-trigger.c | 22 +++++++++++++++++++++-
>  include/linux/iio/trigger.h        |  1 +
>  2 files changed, 22 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
> index 784dc1e00310..c616297aa754 100644
> --- a/drivers/iio/industrialio-trigger.c
> +++ b/drivers/iio/industrialio-trigger.c
> @@ -322,7 +322,7 @@ int iio_trigger_attach_poll_func(struct iio_trigger *trig,
>  	 * this is the case if the IIO device and the trigger device share the
>  	 * same parent device.
>  	 */
> -	if (pf->indio_dev->dev.parent == trig->dev.parent)
> +	if (iio_validate_own_trigger(pf->indio_dev, trig))
>  		trig->attached_own_device = true;
>  
>  	return ret;
> @@ -728,6 +728,26 @@ bool iio_trigger_using_own(struct iio_dev *indio_dev)
>  }
>  EXPORT_SYMBOL(iio_trigger_using_own);
>  
> +/**
> + * iio_validate_own_trigger - Check if a trigger and IIO device belong to
> + *  the same device
> + * @idev: the IIO device to check
> + * @trig: The IIO trigger to check

The / the consistency needs fixing. I'm not sure on the local / file convention, but
it hopefully isn't a random mixture!

> + *
> + * This function can be used as the validate_trigger callback for triggers that
> + * can only be attached to their own device.
> + *
> + * Return: 0 if both the trigger and the IIO device belong to the same
> + * device, -EINVAL otherwise.
> + */
> +int iio_validate_own_trigger(struct iio_dev *idev, struct iio_trigger *trig)
> +{
> +	if (idev->dev.parent != trig->dev.parent)
> +		return -EINVAL;
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(iio_validate_own_trigger);
> +
>  /**
>   * iio_trigger_validate_own_device - Check if a trigger and IIO device belong to
>   *  the same device
> diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
> index 51f52c5c6092..bce3b1788199 100644
> --- a/include/linux/iio/trigger.h
> +++ b/include/linux/iio/trigger.h
> @@ -171,6 +171,7 @@ void iio_trigger_free(struct iio_trigger *trig);
>   */
>  bool iio_trigger_using_own(struct iio_dev *indio_dev);
>  
> +int iio_validate_own_trigger(struct iio_dev *idev, struct iio_trigger *trig);
>  int iio_trigger_validate_own_device(struct iio_trigger *trig,
>  				     struct iio_dev *indio_dev);
>
diff mbox series

Patch

diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 784dc1e00310..c616297aa754 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -322,7 +322,7 @@  int iio_trigger_attach_poll_func(struct iio_trigger *trig,
 	 * this is the case if the IIO device and the trigger device share the
 	 * same parent device.
 	 */
-	if (pf->indio_dev->dev.parent == trig->dev.parent)
+	if (iio_validate_own_trigger(pf->indio_dev, trig))
 		trig->attached_own_device = true;
 
 	return ret;
@@ -728,6 +728,26 @@  bool iio_trigger_using_own(struct iio_dev *indio_dev)
 }
 EXPORT_SYMBOL(iio_trigger_using_own);
 
+/**
+ * iio_validate_own_trigger - Check if a trigger and IIO device belong to
+ *  the same device
+ * @idev: the IIO device to check
+ * @trig: The IIO trigger to check
+ *
+ * This function can be used as the validate_trigger callback for triggers that
+ * can only be attached to their own device.
+ *
+ * Return: 0 if both the trigger and the IIO device belong to the same
+ * device, -EINVAL otherwise.
+ */
+int iio_validate_own_trigger(struct iio_dev *idev, struct iio_trigger *trig)
+{
+	if (idev->dev.parent != trig->dev.parent)
+		return -EINVAL;
+	return 0;
+}
+EXPORT_SYMBOL_GPL(iio_validate_own_trigger);
+
 /**
  * iio_trigger_validate_own_device - Check if a trigger and IIO device belong to
  *  the same device
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index 51f52c5c6092..bce3b1788199 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -171,6 +171,7 @@  void iio_trigger_free(struct iio_trigger *trig);
  */
 bool iio_trigger_using_own(struct iio_dev *indio_dev);
 
+int iio_validate_own_trigger(struct iio_dev *idev, struct iio_trigger *trig);
 int iio_trigger_validate_own_device(struct iio_trigger *trig,
 				     struct iio_dev *indio_dev);