[PATCH] iio: trigger: Remove redundant conditionals

From: Gyeyoung Baek
Date: Sat May 03 2025 - 14:57:05 EST


Checks for null initially and return early.
So there is no need to check for null later.

Signed-off-by: Gyeyoung Baek <gye976@xxxxxxxxx>
---
drivers/iio/industrialio-trigger.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 54416a384232..6abf2a450202 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -453,36 +453,32 @@ static ssize_t current_trigger_store(struct device *dev,
}

trig = iio_trigger_acquire_by_name(buf);
- if (oldtrig == trig) {
+ if (!trig || trig == oldtrig) {
ret = len;
goto out_trigger_put;
}
-
- if (trig && indio_dev->info->validate_trigger) {
+ if (indio_dev->info->validate_trigger) {
ret = indio_dev->info->validate_trigger(indio_dev, trig);
if (ret)
goto out_trigger_put;
}
-
- if (trig && trig->ops && trig->ops->validate_device) {
+ if (trig->ops && trig->ops->validate_device) {
ret = trig->ops->validate_device(trig, indio_dev);
if (ret)
goto out_trigger_put;
}

- indio_dev->trig = trig;
-
if (oldtrig) {
if (indio_dev->modes & INDIO_EVENT_TRIGGERED)
iio_trigger_detach_poll_func(oldtrig,
indio_dev->pollfunc_event);
iio_trigger_put(oldtrig);
}
- if (indio_dev->trig) {
- if (indio_dev->modes & INDIO_EVENT_TRIGGERED)
- iio_trigger_attach_poll_func(indio_dev->trig,
- indio_dev->pollfunc_event);
- }
+ if (indio_dev->modes & INDIO_EVENT_TRIGGERED)
+ iio_trigger_attach_poll_func(trig,
+ indio_dev->pollfunc_event);
+
+ indio_dev->trig = trig;

return len;

--
2.43.0