iio: light: si1133: driver cleanup
v3 cover iio: light: si1133: driver cleanup
This series deals with the cleanup and modernization of the Silicon Labs SI1133 UV/Ambient light sensor.
What seemed like a simple checkpatch cleanup turned out to be more complex, therefore I've ended up doing a patch series instead.
Changes include:
- adding missing headers
- removing unused macros
- adding guard(mutex)() support
- code style fixes
- race condition fixes reported by Sashiko
---
Changes in v3:
- PATCH 6: add local variable for timeout
- PATCH 7 & 8: fix potential race conditions as pointed out by Sashiko
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Change v2 to patch series
- PATCH 2: remove unused macros
- PATCH 3: add missing include headers
- PATCH 4: group generic <linux/*> headers
- PATCH 5: add guard(mutex)() support
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Joshua Crofts (8):
iio: light: si1133: remove unused macros
iio: light: si1133: prefer complex macros enclosed in parenthesis
iio: light: si1133: add missing include headers
iio: light: si1133: group generic <linux/*> headers
iio: light: si1133: use guard(mutex)() macro
iio: light: si1133: add local variable for timeout
iio: light: si1133: reset counter to prevent race condition
iio: light: si1133: prevent race condition on timeout
drivers/iio/light/si1133.c | 73 ++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 28 deletions(-)
---
base-commit: d86db1905add39f905cf9f04252804b359914ed6
change-id: 20260427-si1133-checkup-abcc5280adf3
Best regards,
Signature · 1 line
Joshua Crofts <[email protected]>
PATCH v3 1/8 iio: light: si1133: remove unused macros
Remove unused macros to improve readability.
No functional change.
--- drivers/iio/light/si1133.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/iio/light/si1133.c +0 -4
@@ -86,13 +86,9 @@#define SI1133_CMD_MINSLEEP_US_LOW 5000#define SI1133_CMD_MINSLEEP_US_HIGH 7500#define SI1133_CMD_TIMEOUT_MS 25 -#define SI1133_CMD_LUX_TIMEOUT_MS 5000 -#define SI1133_CMD_TIMEOUT_US SI1133_CMD_TIMEOUT_MS * 1000#define SI1133_REG_HOSTOUT (x) (x) + 0x13 -#define SI1133_MEASUREMENT_FREQUENCY 1250 -#define SI1133_X_ORDER_MASK 0x0070#define SI1133_Y_ORDER_MASK 0x0007#define si1133_get_x_order (m) ((m) & SI1133_X_ORDER_MASK) >> 4
Signature · 1 line
2.47.3
Re: [PATCH v3 1/8] iio: light: si1133: remove unused macros
Quoted 1 line · On Wed, Apr 29, 2026 at 05:04:49PM +0200, Joshua Crofts via B4 Relay wrote:
Remove unused macros to improve readability.
Perhaps needs elaboration that these macros a purely Linux ones and has no (direct) relation to the HW.
Quoted 1 line
No functional change.
Suggested-by? (I am fine without that tag, up to you.)
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v3 1/8] iio: light: si1133: remove unused macros
Quoted 7 lines · Andy Shevchenko
Quoted 1 line · On Wed, Apr 29, 2026 at 05:04:49PM +0200, Joshua Crofts via B4 Relay wrote:
Remove unused macros to improve readability.
Perhaps needs elaboration that these macros a purely Linux ones and has no (direct) relation to the HW.
Sure, will add a more detailed description.
Quoted 2 lines
Suggested-by? (I am fine without that tag, up to you.)
Credit where credit is due :)
Signature · 3 lines
Kind regards CJD
PATCH v3 2/8 iio: light: si1133: prefer complex macros enclosed in parenthesis
In reply to Joshua CroftsEnclose complex macros in parenthesis per checkpatch.pl error to improve code style.
--- drivers/iio/light/si1133.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/iio/light/si1133.c +8 -8
@@ -50,23 +50,23 @@#define SI1133_MAX_CMD_CTR 0xF#define SI1133_PARAM_REG_CHAN_LIST 0x01 -#define SI1133_PARAM_REG_ADCCONFIG (x) ((x) * 4) + 2 -#define SI1133_PARAM_REG_ADCSENS (x) ((x) * 4) + 3 -#define SI1133_PARAM_REG_ADCPOST (x) ((x) * 4) + 4 +#define SI1133_PARAM_REG_ADCCONFIG (x) (((x) * 4) + 2) +#define SI1133_PARAM_REG_ADCSENS (x) (((x) * 4) + 3) +#define SI1133_PARAM_REG_ADCPOST (x) (((x) * 4) + 4)#define SI1133_ADCMUX_MASK 0x1F -#define SI1133_ADCCONFIG_DECIM_RATE (x) (x) << 5 +#define SI1133_ADCCONFIG_DECIM_RATE (x) ((x) << 5)#define SI1133_ADCSENS_SCALE_MASK 0x70#define SI1133_ADCSENS_SCALE_SHIFT 4#define SI1133_ADCSENS_HSIG_MASK BIT(7)#define SI1133_ADCSENS_HSIG_SHIFT 7#define SI1133_ADCSENS_HW_GAIN_MASK 0xF -#define SI1133_ADCSENS_NB_MEAS (x) fls(x) << SI1133_ADCSENS_SCALE_SHIFT +#define SI1133_ADCSENS_NB_MEAS (x) (fls(x) << SI1133_ADCSENS_SCALE_SHIFT)#define SI1133_ADCPOST_24BIT_EN BIT(6) -#define SI1133_ADCPOST_POSTSHIFT_BITQTY (x) (x & GENMASK(2, 0)) << 3 +#define SI1133_ADCPOST_POSTSHIFT_BITQTY (x) (((x) & GENMASK(2, 0)) << 3)#define SI1133_PARAM_ADCMUX_SMALL_IR 0x0#define SI1133_PARAM_ADCMUX_MED_IR 0x1
@@ -87,11 +87,11 @@#define SI1133_CMD_MINSLEEP_US_HIGH 7500#define SI1133_CMD_TIMEOUT_MS 25 -#define SI1133_REG_HOSTOUT (x) (x) + 0x13 +#define SI1133_REG_HOSTOUT (x) ((x) + 0x13)#define SI1133_X_ORDER_MASK 0x0070#define SI1133_Y_ORDER_MASK 0x0007 -#define si1133_get_x_order (m) ((m) & SI1133_X_ORDER_MASK) >> 4 +#define si1133_get_x_order (m) (((m) & SI1133_X_ORDER_MASK) >> 4)#define si1133_get_y_order (m) ((m) & SI1133_Y_ORDER_MASK)#define SI1133_LUX_ADC_MASK 0xE
Signature · 1 line
2.47.3
PATCH v3 3/8 iio: light: si1133: add missing include headers
In reply to Joshua CroftsAdd missing include headers to prevent compilation relying on transient dependencies (array_size.h, bitops.h, completion.h, dev_printk.h, err.h, irqreturn.h, jiffies.h, math.h, mutex.h, types.h).
--- drivers/iio/light/si1133.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/iio/light/si1133.c +10 -0
@@ -6,11 +6,21 @@* Copyright 2018 Maxime Roussin-Belanger <[email protected]> */ +#include <linux/array_size.h> +#include <linux/bitops.h> +#include <linux/completion.h> #include <linux/delay.h> +#include <linux/dev_printk.h> +#include <linux/err.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/irqreturn.h> +#include <linux/jiffies.h> +#include <linux/math.h> #include <linux/module.h> +#include <linux/mutex.h> #include <linux/regmap.h> +#include <linux/types.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h>
Signature · 1 line
2.47.3
Re: [PATCH v3 3/8] iio: light: si1133: add missing include headers
Quoted 3 lines · On Wed, Apr 29, 2026 at 05:04:51PM +0200, Joshua Crofts via B4 Relay wrote:
Add missing include headers to prevent compilation relying on transient dependencies (
array_size.h,bitops.h,completion.h,dev_printk.h,err.h,irqreturn.h,jiffies.h,math.h,mutex.h,types.h).
...
drivers/iio/light/si1133.c
Quoted 10 lines
drivers/iio/light/si1133.c +6
-0+#include <linux/array_size.h> +#include <linux/bitops.h> +#include <linux/completion.h> #include <linux/delay.h> +#include <linux/dev_printk.h> +#include <linux/err.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/irqreturn.h>
Assumed by interrupt.h
drivers/iio/light/si1133.c line 19
Quoted 2 lines
drivers/iio/light/si1133.c +2
-0+#include <linux/jiffies.h> +#include <linux/math.h>
Also mod_devicetable.h
*Yes, most of the SPI/I²C drivers do not do that, I know.
Quoted 5 lines
#include <
linux/module.h>drivers/iio/light/si1133.c +2
-0+#include <linux/mutex.h> #include <linux/regmap.h> +#include <linux/types.h>
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v3 3/8] iio: light: si1133: add missing include headers
Quoted 3 lines · Andy Shevchenko
Quoted 1 line
+#include <
linux/irqreturn.h>Assumed by
interrupt.h
Will do.
Quoted 2 lines
Also
mod_devicetable.h
*Yes, most of the SPI/I涎 drivers do not do that, I know.
How did I miss mod_devicetable.h after adding it in several IWYU patches?
Signature · 3 lines
Kind regards CJD
PATCH v3 4/8 iio: light: si1133: group generic <linux/*> headers
In reply to Joshua CroftsGroup generic <linux/*> include headers to improve code style.
No functional change.
--- drivers/iio/light/si1133.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/iio/light/si1133.c +2 -4
@@ -21,14 +21,12 @@#include <linux/mutex.h> #include <linux/regmap.h> #include <linux/types.h> +#include <linux/unaligned.h> +#include <linux/util_macros.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> -#include <linux/util_macros.h> - -#include <linux/unaligned.h> -#define SI1133_REG_PART_ID 0x00#define SI1133_REG_REV_ID 0x01#define SI1133_REG_MFR_ID 0x02
Signature · 1 line
2.47.3
PATCH v3 5/8 iio: light: si1133: use guard(mutex)() macro
In reply to Joshua CroftsRemove mutex_lock()/mutex_unlock() and goto instances and add guard(mutex)() macro to modernize driver and improve mutex handling.
--- drivers/iio/light/si1133.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/iio/light/si1133.c +7 -11
@@ -8,6 +8,7 @@#include <linux/array_size.h> #include <linux/bitops.h> +#include <linux/cleanup.h> #include <linux/completion.h> #include <linux/delay.h> #include <linux/dev_printk.h>
@@ -395,7 +396,7 @@ static int si1133_command(struct si1133_data *data, u8 cmd)int err;int expected_seq; -mutex_lock (&data->mutex); +guard (mutex)(&data->mutex); expected_seq = (data->rsp_seq +1 ) &SI1133_MAX_CMD_CTR ;
@@ -406,19 +407,17 @@ static int si1133_command(struct si1133_data *data, u8 cmd)if (err) {dev_warn (dev,"Failed to write command 0x%02x, ret=%d\n" , cmd, err); - goto out; +return err; }if (cmd ==SI1133_CMD_FORCE ) {/* wait for irq */ if (!wait_for_completion_timeout (&data->completion, -msecs_to_jiffies (SI1133_COMPLETION_TIMEOUT_MS ))) { - err = -ETIMEDOUT ; - goto out; - } +msecs_to_jiffies (SI1133_COMPLETION_TIMEOUT_MS ))) +return -ETIMEDOUT ; err =regmap_read (data->regmap,SI1133_REG_RESPONSE0 , &resp);if (err) - goto out; +return err; }else { err = regmap_read_poll_timeout(data->regmap, SI1133_REG_RESPONSE0, resp,
@@ -431,7 +430,7 @@ static int si1133_command(struct si1133_data *data, u8 cmd)dev_warn (dev,"Failed to read command 0x%02x, ret=%d\n" , cmd, err); - goto out; +return err; } }
@@ -442,9 +441,6 @@ static int si1133_command(struct si1133_data *data, u8 cmd) data->rsp_seq = expected_seq; } -out: -mutex_unlock (&data->mutex); -return err; }
Signature · 1 line
2.47.3
Re: [PATCH v3 5/8] iio: light: si1133: use guard(mutex)() macro
Quoted 2 lines · On Wed, Apr 29, 2026 at 05:04:53PM +0200, Joshua Crofts via B4 Relay wrote:
Remove mutex_lock()/mutex_unlock() and goto instances and add guard(mutex)() macro to modernize driver and improve mutex handling.
...
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 417
Quoted 3 lines
drivers/iio/light/si1133.c +2
-0if (!wait_for_completion_timeout (&data->completion, +msecs_to_jiffies (SI1133_COMPLETION_TIMEOUT_MS ))) +return -ETIMEDOUT ;
I believe Jonathan gave you a green light for loner line and properly indented.
if (!wait_for_completion_timeout(&data->completion, msecs_to_jiffies(SI1133_COMPLETION_TIMEOUT_MS)))
It fits 100 and hence doesn't trigger a warning in checkpatch (in default mode).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v3 5/8] iio: light: si1133: use guard(mutex)() macro
Quoted 12 lines · Andy Shevchenko
Quoted 2 lines · On Wed, Apr 29, 2026 at 05:04:53PM +0200, Joshua Crofts via B4 Relay wrote:
Remove mutex_lock()/mutex_unlock() and goto instances and add guard(mutex)() macro to modernize driver and improve mutex handling.
...
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 417
Quoted 3 lines
if (!wait_for_completion_timeout(&data->completion,drivers/iio/light/si1133.c +2
-0+ msecs_to_jiffies(SI1133_COMPLETION_TIMEOUT_MS))) +return -ETIMEDOUT ;
Quoted 6 lines
I believe Jonathan gave you a green light for loner line and properly indented.
if (!wait_for_completion_timeout(&data->completion, msecs_to_jiffies(SI1133_COMPLETION_TIMEOUT_MS)))It fits 100 and hence doesn't trigger a warning in checkpatch (in default mode).
Yeah, it's more of a problem of me not putting patch 6 before this one.
Signature · 3 lines
Kind regards CJD
PATCH v3 6/8 iio: light: si1133: add local variable for timeout
In reply to Joshua CroftsAdd local variable for timeout to improve readability.
No functional change.
--- drivers/iio/light/si1133.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/light/si1133.c +2 -2
@@ -391,6 +391,7 @@ static int si1133_cmd_reset_counter(struct si1133_data *data)static int si1133_command (struct si1133_data *data,u8 cmd) { +unsigned long timeout =msecs_to_jiffies (SI1133_COMPLETION_TIMEOUT_MS );struct device *dev = &data->client->dev;u32 resp;int err;
@@ -412,8 +413,7 @@ static int si1133_command(struct si1133_data *data, u8 cmd)if (cmd ==SI1133_CMD_FORCE ) {/* wait for irq */ -if (!wait_for_completion_timeout (&data->completion, -msecs_to_jiffies (SI1133_COMPLETION_TIMEOUT_MS ))) +if (!wait_for_completion_timeout (&data->completion, timeout))return -ETIMEDOUT ; err =regmap_read (data->regmap,SI1133_REG_RESPONSE0 , &resp);if (err)
Signature · 1 line
2.47.3
Re: [PATCH v3 6/8] iio: light: si1133: add local variable for timeout
Quoted 3 lines · On Wed, Apr 29, 2026 at 05:04:54PM +0200, Joshua Crofts via B4 Relay wrote:
Add local variable for timeout to improve readability.
No functional change.
Ah, with this it doesn't make much sense to indent properly but it makes me think that this patch should go before that one.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v3 7/8 iio: light: si1133: reset counter to prevent race condition
In reply to Joshua CroftsSashiko reported a potential race condition happening when the driver returns an errno after a timeout in the si1133_command() function. The premature exit causes the hardware and software counters to become out of sync by not updating data->rsp_seq, therefore the internal hardware counter keeps incrementing.
Fix this by adding a call to si1133_cmd_reset_counter() before returing from timeout.
--- drivers/iio/light/si1133.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/iio/light/si1133.c +6 -0
@@ -430,6 +430,12 @@ static int si1133_command(struct si1133_data *data, u8 cmd)dev_warn (dev,"Failed to read command 0x%02x, ret=%d\n" , cmd, err); +/* +* reset counter on err to prevent sofware and hardware +* counters being out of sync +*/ +si1133_cmd_reset_counter (data); +return err; } }
Signature · 1 line
2.47.3
Re: [PATCH v3 7/8] iio: light: si1133: reset counter to prevent race condition
Quoted 11 lines · On Wed, Apr 29, 2026 at 05:04:55PM +0200, Joshua Crofts via B4 Relay wrote:
Sashiko reported a potential race condition happening when the driver returns an errno after a timeout in the
si1133_command()function. The premature exit causes the hardware and software counters to become out of sync by not updatingdata->rsp_seq, therefore the internal hardware counter keeps incrementing.Fix this by adding a call to
si1133_cmd_reset_counter()before returing from timeout.Assisted-by gemini:gemini-3.1-pro-preview
// linux-iio mailing list.
,,,
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 436
Quoted 4 lines
drivers/iio/light/si1133.c +4
-0+/* +* reset counter on err to prevent sofware and hardware +* counters being out of sync +*/
/*
* Respect English grammar and punctuation. This is
* the style for multi-line comments. You can consider
* this example.
*/
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v3 7/8] iio: light: si1133: reset counter to prevent race condition
Quoted 10 lines · Andy Shevchenko
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 436
Quoted 4 lines
drivers/iio/light/si1133.c +4
-0+/* +* reset counter on err to prevent sofware and hardware +* counters being out of sync +*/ /*
* Respect English grammar and punctuation. This is
* the style for multi-line comments. You can consider
* this example.
*/
See patch 8.
Signature · 3 lines
Kind regards CJD
PATCH v3 8/8 iio: light: si1133: prevent race condition on timeout
In reply to Joshua CroftsSashiko reported a bug where the si1133_command exits on timeout without halting the sensor or masking the interrupt. If the sensor completes the command later, any subsequent command to the sensor will cause the IRQ handler to complete immediately, returning stale data to the driver all while the command hasn't finished yet, shifting all potential reads in the future.
Fix this by masking the IRQ if wait_for_completion_timeout() fails. When initiating a new command, do a dummy read of the IRQ_STATUS register and turn the IRQ back on.
--- drivers/iio/light/si1133.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/iio/light/si1133.c +15 -4
@@ -401,8 +401,14 @@ static int si1133_command(struct si1133_data *data, u8 cmd) expected_seq = (data->rsp_seq +1 ) &SI1133_MAX_CMD_CTR ; -if (cmd ==SI1133_CMD_FORCE ) +if (cmd ==SI1133_CMD_FORCE ) { +/* Flush pending IRQs from a previous timeout. */ +regmap_read (data->regmap,SI1133_REG_IRQ_STATUS , &resp); +regmap_write (data->regmap,SI1133_REG_IRQ_ENABLE , +SI1133_IRQ_CHANNEL_ENABLE ); +reinit_completion (&data->completion); + } err =regmap_write (data->regmap,SI1133_REG_COMMAND , cmd);if (err) {
@@ -413,8 +419,13 @@ static int si1133_command(struct si1133_data *data, u8 cmd)if (cmd ==SI1133_CMD_FORCE ) {/* wait for irq */ -if (!wait_for_completion_timeout (&data->completion, timeout)) +if (!wait_for_completion_timeout (&data->completion, timeout)) { +/* Mask the IRQ to prevent delayed interrupt waking up +* any subsequent command. +*/ +regmap_write (data->regmap,SI1133_REG_IRQ_ENABLE ,0 );return -ETIMEDOUT ; + } err =regmap_read (data->regmap,SI1133_REG_RESPONSE0 , &resp);if (err)return err;
@@ -431,8 +442,8 @@ static int si1133_command(struct si1133_data *data, u8 cmd)"Failed to read command 0x%02x, ret=%d\n" , cmd, err);/* -* reset counter on err to prevent sofware and hardware -* counters being out of sync +* Reset counter on err to prevent sofware and hardware +* counters being out of sync. */ si1133_cmd_reset_counter (data);
Signature · 1 line
2.47.3
Re: [PATCH v3 8/8] iio: light: si1133: prevent race condition on timeout
Quoted 7 lines · On Wed, Apr 29, 2026 at 05:04:56PM +0200, Joshua Crofts via B4 Relay wrote:
Sashiko reported a bug where the
si1133_commandexits on timeout without halting the sensor or masking the interrupt. If the sensor completes the command later, any subsequent command to the sensor will cause the IRQ handler to complete immediately, returning stale data to the driver all while the command hasn't finished yet, shifting all potential reads in the future.
Quoted 7 lines
Fix this by masking the IRQ if
wait_for_completion_timeout()fails. When initiating a new command, do a dummy read of theIRQ_STATUSregister and turn the IRQ back on.Assisted-by gemini:gemini-3.1-pro-previewSigned-off-by Joshua Crofts <[email protected]>
Reported-by?
Also with this seems the Fixes tag is appropriate (and in the other patch). Also note, fixes should go first in the series.
...
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 428
Quoted 8 lines
drivers/iio/light/si1133.c +6
-1-if (!wait_for_completion_timeout (&data->completion, timeout)) +if (!wait_for_completion_timeout (&data->completion, timeout)) { +/* Mask the IRQ to prevent delayed interrupt waking up +* any subsequent command. +*/ +regmap_write (data->regmap,SI1133_REG_IRQ_ENABLE ,0 );return -ETIMEDOUT ; + }
Seems like you dropped {} and reinstantiated them. It's not good style. Just make sure that the first patch that does something leaves it in the form that next patches won't have too many + or - lines that basically revert previous subchanges. I call this style ping-pong and highly discourage from using it.
...
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 447
Quoted 7 lines
drivers/iio/light/si1133.c +2
-2/* -* reset counter on err to prevent sofware and hardware -* counters being out of sync +* Reset counter on err to prevent sofware and hardware +* counters being out of sync. */
Ha-ha, doesn't belong to this change (see also previous reply).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v3 8/8] iio: light: si1133: prevent race condition on timeout
Quoted 4 lines · Andy Shevchenko
Reported-by?
Also with this seems the Fixes tag is appropriate (and in the other patch). Also note, fixes should go first in the series.
Yeah, makes sense.
Quoted 11 lines
...
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 428
Quoted 8 lines
drivers/iio/light/si1133.c +6
-1-if (!wait_for_completion_timeout (&data->completion, timeout)) +if (!wait_for_completion_timeout (&data->completion, timeout)) { +/* Mask the IRQ to prevent delayed interrupt waking up +* any subsequent command. +*/ +regmap_write (data->regmap,SI1133_REG_IRQ_ENABLE ,0 );return -ETIMEDOUT ; + }
Quoted 4 lines
Seems like you dropped {} and reinstantiated them. It's not good style. Just make sure that the first patch that does something leaves it in the form that next patches won't have too many + or - lines that basically revert previous subchanges. I call this style ping-pong and highly discourage from using it.
Agreed, I seem to have missed this.
Quoted 10 lines
drivers/iio/light/si1133.c static int si1133_command(struct si1133_data *data, u8 cmd) · line 447
Quoted 8 lines
/*drivers/iio/light/si1133.c +2
-2-* reset counter on err to prevent sofware and hardware -* counters being out of sync +* Reset counter on err to prevent sofware and hardware +* counters being out of sync. */ Ha-ha, doesn't belong to this change (see also previous reply).
I noticed this immediately after sending the series :((( I must've edited it while rebasing...
Signature · 3 lines
Kind regards CJD
Quoted 5 lines · On Wed, Apr 29, 2026 at 05:04:48PM +0200, Joshua Crofts via B4 Relay wrote:
This series deals with the cleanup and modernization of the Silicon Labs SI1133 UV/Ambient light sensor.
What seemed like a simple checkpatch cleanup turned out to be more complex, therefore I've ended up doing a patch series instead.
In general LGTM, but there are several nit-picks that needs to be addressed, I hope the v4 will be final.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 10 lines · Andy Shevchenko
Quoted 5 lines · On Wed, Apr 29, 2026 at 05:04:48PM +0200, Joshua Crofts via B4 Relay wrote:
This series deals with the cleanup and modernization of the Silicon Labs SI1133 UV/Ambient light sensor.
What seemed like a simple checkpatch cleanup turned out to be more complex, therefore I've ended up doing a patch series instead.
In general LGTM, but there are several nit-picks that needs to be addressed, I hope the v4 will be final.
Not really nit-picks, the majority of your comments stem from me ordering my patches incorrectly, it would shorten review time.
Signature · 3 lines
Kind regards CJD