On 10/28/24 06:53, Stephen Rothwell wrote:
Hi all,
After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/iio/magnetometer/af8133j.c: In function 'af8133j_set_scale':
drivers/iio/magnetometer/af8133j.c:315:12: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=dangling-else]
315 | if (!pm_runtime_status_suspended(dev))
| ^
cc1: all warnings being treated as errors
Probably caused by commit
fcc22ac5baf0 ("cleanup: Adjust scoped_guard() macros to avoid potential warning")
I have applied the following for today but I wonder if there may be
others.
From 93183168618777d573cd809a971c4db59a8dc800 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 28 Oct 2024 16:01:15 +1100
Subject: [PATCH] fix up for "cleanup: Adjust scoped_guard() macros to avoid
potential warning"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
thanks a lot!, and sorry for inconvenience
(I had same patch ready to send, but after some refactors I was fooled
to think that is not needed, sorry again)
---
drivers/iio/magnetometer/af8133j.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/magnetometer/af8133j.c b/drivers/iio/magnetometer/af8133j.c
index d81d89af6283..acd291f3e792 100644
--- a/drivers/iio/magnetometer/af8133j.c
+++ b/drivers/iio/magnetometer/af8133j.c
@@ -312,10 +312,11 @@ static int af8133j_set_scale(struct af8133j_data *data,
* When suspended, just store the new range to data->range to be
* applied later during power up.
*/
- if (!pm_runtime_status_suspended(dev))
+ if (!pm_runtime_status_suspended(dev)) {
scoped_guard(mutex, &data->mutex)
ret = regmap_write(data->regmap,
AF8133J_REG_RANGE, range);
+ }
pm_runtime_enable(dev);
