On Wed Sep 30 14:41:33 2026 +0800, Hermes Wu wrote:
> Convert the if/else if/else chain that only ever assigns a single
> ret value to early returns. guard(mutex)(...) is scoped to the whole
> function body, so an early return still unlocks correctly.
>
> Signed-off-by: Hermes Wu <[email protected]>
> Signed-off-by: Hans Verkuil <[email protected]>
Patch committed.
Thanks,
Hans Verkuil
drivers/media/i2c/it6625.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/drivers/media/i2c/it6625.c b/drivers/media/i2c/it6625.c
index c6fff4fe4983..b888d4db5599 100644
--- a/drivers/media/i2c/it6625.c
+++ b/drivers/media/i2c/it6625.c
@@ -1457,20 +1457,17 @@ static int
it6625_update_timings_if_changed(struct it6625 *it6625,
const struct v4l2_dv_timings *timings)
{
- int ret;
-
guard(mutex)(&it6625->it6625_lock);
- if (v4l2_match_dv_timings(&it6625->timings, timings, 0, false)) {
- ret = 0;
- } else if (!v4l2_valid_dv_timings(timings,
it6625_get_timings_cap(it6625),
- NULL, NULL)) {
- ret = -ERANGE;
- } else {
- it6625->timings = *timings;
- ret = 1;
- }
- return ret;
+ if (v4l2_match_dv_timings(&it6625->timings, timings, 0, false))
+ return 0;
+
+ if (!v4l2_valid_dv_timings(timings, it6625_get_timings_cap(it6625),
NULL, NULL))
+ return -ERANGE;
+
+ it6625->timings = *timings;
+
+ return 1;
}
static int it6625_enum_dv_timings(struct v4l2_subdev *sd,
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
