cirrus: fix typos in comments
Subsystems (5)
v2 cover cirrus: fix typos in comments
This is v2 of the spelling fixes for this tree.
Changes since v1:
The mfd patch now carries the driver name and a capitalised description in its subject, to match the subsystem convention.
Only comments change; no code is touched.
drivers/firmware/cirrus/cs_dsp.c | 2 +- drivers/mfd/wm831x-auxadc.c | 2 +- sound/soc/codecs/wm8962.c | 4 ++-- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm_hubs.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
PATCH v2 1/3 ASoC: codecs: fix typos in comments
Fix typos in comments, reported by scripts/checkpatch.pl using the misspelling list in scripts/spelling.txt. Only touches comments, no code changes.
--- sound/soc/codecs/wm8962.c | 4 ++-- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm_hubs.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8962.c +2 -2
@@ -3430,7 +3430,7 @@ static int wm8962_gpio_request(struct gpio_chip *chip, unsigned offset)/* The WM8962 GPIOs aren't linearly numbered. For simplicity * we export linear numbers and error out if the unsupported -* ones are requsted. +* ones are requested. */ switch (offset +1 ) {case 2 :
@@ -3813,7 +3813,7 @@ static int wm8962_i2c_probe(struct i2c_client *i2c)regmap_update_bits (wm8962->regmap,WM8962_EQ1 ,WM8962_EQ_SHARED_COEFF ,0 ); -/* Don't debouce interrupts so we don't need SYSCLK */ +/* Don't debounce interrupts so we don't need SYSCLK */ regmap_update_bits(wm8962->regmap, WM8962_IRQ_DEBOUNCE, WM8962_FLL_LOCK_DB | WM8962_PLL3_LOCK_DB | WM8962_PLL2_LOCK_DB | WM8962_TEMP_SHUT_DB,
sound/soc/codecs/wm8996.c +1 -1
@@ -2106,7 +2106,7 @@ static int wm8996_set_fll(struct snd_soc_component *component, int fll_id, int sif (i2c->irq) timeout *=10 ;else -/* ensure timeout of atleast 1 jiffies */ +/* ensure timeout of at least 1 jiffies */ timeout = (timeout/2 ) ? :1 ;for (retry =0 ; retry <10 ; retry++) {
sound/soc/codecs/wm_hubs.c +1 -1
@@ -338,7 +338,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol, ret =snd_soc_put_volsw (kcontrol, ucontrol);/* If we're applying an offset correction then updating the -* callibration would be likely to introduce further offsets. */ +* calibration would be likely to introduce further offsets. */ if (hubs->dcs_codes_l || hubs->dcs_codes_r || hubs->no_series_update)return ret;
PATCH v2 2/3 firmware: cirrus: fix typo "upto" in comment
In reply to Hemanth SelamCorrect "upto" to "up to", reported by scripts/checkpatch.pl using the misspelling list in scripts/spelling.txt. Only touches comments, no code changes.
--- drivers/firmware/cirrus/cs_dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/cirrus/cs_dsp.c +1 -1
@@ -3505,7 +3505,7 @@ EXPORT_SYMBOL_NS_GPL(cs_dsp_chunk_write, "FW_CS_DSP");* * As cs_dsp_chunk_write only writes data when a whole DSP word is ready to * be written out it is possible that some data will remain in the cache, this -* function will pad that data with zeros upto a whole DSP word and write out. +* function will pad that data with zeros up to a whole DSP word and write out. * * Return: Zero for success, a negative number on error. */
PATCH v2 3/3 mfd: wm831x: Fix typo "convertor" in comment
In reply to Hemanth SelamCorrect "convertor" to "converter", reported by scripts/checkpatch.pl using the misspelling list in scripts/spelling.txt. Only touches a comment, no code changes.
Since v1 the subject carries the driver name and a capitalised description, to match the MFD subsystem convention.
--- drivers/mfd/wm831x-auxadc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/wm831x-auxadc.c +1 -1
@@ -132,7 +132,7 @@ static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data) 1 << input, 0); wm831x->auxadc_active &= ~(1 << input); -/* Turn off the entire convertor if idle */ +/* Turn off the entire converter if idle */ if (!wm831x->auxadc_active)wm831x_reg_write (wm831x,WM831X_AUXADC_CONTROL ,0 );
[email protected]
AI reviewRe: [PATCH v2 2/3] firmware: cirrus: fix typo "upto" in comment
In reply to Hemanth SelamSashiko has reviewed this patch and found no issues. It looks great!
Quoted 6 lines
Correct "upto" to "up to", reported by
scripts/checkpatch.plusing the misspelling list inscripts/spelling.txt. Only touches comments, no code changes.Assisted-by Cursor:claude-opus-5Signed-off-by Hemanth Selam <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
[email protected]
AI reviewRe: [PATCH v2 1/3] ASoC: codecs: fix typos in comments
In reply to Hemanth SelamSashiko has reviewed this patch and found no issues. It looks great!
Quoted 6 lines
Fix typos in comments, reported by
scripts/checkpatch.plusing the misspelling list inscripts/spelling.txt. Only touches comments, no code changes.Assisted-by Cursor:claude-opus-5Signed-off-by Hemanth Selam <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
[email protected]
AI reviewRe: [PATCH v2 3/3] mfd: wm831x: Fix typo "convertor" in comment
In reply to Hemanth SelamThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Negative shift count in wm831x_auxadc_irq due to missing validation of source field.
- [High] State leak on error path in wm831x_auxadc_read_irq causing permanent ADC deadlock. --
commit 50c01f2e8806d70971e1f256c73c3a0a948552c6
Author: Hemanth Selam <[email protected]>
mfd: wm831x: Fix typo "convertor" in comment
This commit fixes a spelling error in a comment within wm831x_auxadc_irq(), changing "convertor" to "converter". No code changes are introduced.
drivers/mfd/wm831x-auxadc.c static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data) · line 133
Quoted 7 lines
drivers/mfd/wm831x-auxadc.c +0
-0@@ -132,7 +132,7 @@ static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data) 1 << input, 0); wm831x->auxadc_active &= ~(1 << input);
[Severity: High]
This is a pre-existing issue, but I have a question about the shift operation here.
If the hardware returns 0 in the source mask field of WM831X_AUXADC_DATA (e.g. due to hardware malfunction or I2C bus corruption), the input calculation:
input = ((ret & WM831X_AUX_DATA_SRC_MASK) >> WM831X_AUX_DATA_SRC_SHIFT) - 1;
evaluates to -1.
This would result in attempting to bitwise shift 1 << -1, which is C undefined behavior and could lead to memory corruption, kernel panics, or unexpected register modifications depending on the architecture.
Could this negative shift count occur due to missing validation of the source field?
drivers/mfd/wm831x-auxadc.c static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data) · line 138
Quoted 5 lines
drivers/mfd/wm831x-auxadc.c +1
-1-/* Turn off the entire convertor if idle */ +/* Turn off the entire converter if idle */ if (!wm831x->auxadc_active)wm831x_reg_write (wm831x,WM831X_AUXADC_CONTROL ,0 );
[Severity: High]
This isn't a bug introduced by this patch, but looking at the error path in wm831x_auxadc_read_irq():
drivers/mfd/wm831x-auxadc.c:wm831x_auxadc_read_irq() {
...
if (!(wm831x->auxadc_active & (1 << input))) {
...
wm831x->auxadc_active |= 1 << input;
}
/* We convert at the fastest rate possible */
if (ena) {
ret = wm831x_set_bits(wm831x, WM831X_AUXADC_CONTROL, ...);
if (ret != 0) {
dev_err(wm831x->dev, "Failed to start AUXADC: %d\n",
ret);
goto out;
}
}
...
out:
list_del(&req->list);
mutex_unlock(&wm831x->auxadc_lock);
kfree(req);
return ret;
}If wm831x_set_bits() fails to start the AUXADC (e.g. due to an I2C error), the function returns via the out label.
However, the active tracking bit wm831x->auxadc_active |= 1 << input; was already set and is never reverted on this error path.
On any subsequent read for this input, the code sees the active bit set, skips enabling the hardware ADC, and hits the wait_for_completion_timeout forever.
The interrupt never fires because the hardware wasn't started, causing a permanent functional failure of the ADC channel, coupled with a 500ms thread stall on every subsequent read attempt.
Does this error path leak the active state and cause a permanent ADC deadlock?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Quoted 6 lines · Hemanth Selam
This is v2 of the spelling fixes for this tree.
Changes since v1:
The mfd patch now carries the driver name and a capitalised description in its subject, to match the subsystem convention.
Quoted 9 lines
Only comments change; no code is touched.
drivers/firmware/cirrus/cs_dsp.c | 2 +- drivers/mfd/wm831x-auxadc.c | 2 +- sound/soc/codecs/wm8962.c | 4 ++-- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm_hubs.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
Thanks,
Charles
Mark Brown
maintainerQuoted 5 lines · Hemanth Selam
drivers/firmware/cirrus/cs_dsp.c | 2 +- drivers/mfd/wm831x-auxadc.c | 2 +- sound/soc/codecs/wm8962.c | 4 ++-- sound/soc/codecs/wm8996.c | 2 +- sound/soc/codecs/wm_hubs.c | 2 +-
Please don't send patches for different subsystems as part of a series if there is no dependency or other interaction, it just makes working out how things are going to be applied more complicated.
Mark Brown
maintainerRe: (subset) [PATCH v2 0/3] cirrus: fix typos in comments
In reply to Hemanth SelamQuoted 9 lines · Hemanth Selam
cirrus: fix typos in comments
This is v2 of the spelling fixes for this tree.
Changes since v1:
The mfd patch now carries the driver name and a capitalised description in its subject, to match the subsystem convention.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.4
Thanks!
[1/3] ASoC: codecs: fix typos in comments
https://git.kernel.org/broonie/sound/c/201af7ba51a1 [2/3] firmware: cirrus: fix typo "upto" in comment https://git.kernel.org/broonie/sound/c/20a812a1f664
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Re: (subset) [PATCH v2 3/3] mfd: wm831x: Fix typo "convertor" in comment
In reply to Hemanth SelamQuoted 8 lines · Hemanth Selam
Correct "convertor" to "converter", reported by
scripts/checkpatch.plusing the misspelling list inscripts/spelling.txt. Only touches a comment, no code changes.Since v1 the subject carries the driver name and a capitalised description, to match the MFD subsystem convention.
[...]
Applied, thanks!
[3/3] mfd: wm831x: Fix typo "convertor" in comment
commit: 6b59fafe285338afd1dabbefc9732cfc7de23ece
--
Lee Jones [李琼斯]