| Message ID | 20220417192733.7382-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] ASoC: da7219: Fix change notifications for tone generator frequency | expand |
On 17 April 2022 20:28, Mark Brown wrote: > The tone generator frequency control just returns 0 on successful write, > not a boolean value indicating if there was a change or not. Compare > what was written with the value that was there previously so that > notifications are generated appropraitely when the value changes. s/appropraitely/appropriately/ Thanks for the update. Good spot. > > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > sound/soc/codecs/da7219.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c > index a28d3601b932..c08e15830cec 100644 > --- a/sound/soc/codecs/da7219.c > +++ b/sound/soc/codecs/da7219.c > @@ -446,7 +446,7 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol > *kcontrol, > struct soc_mixer_control *mixer_ctrl = > (struct soc_mixer_control *) kcontrol->private_value; > unsigned int reg = mixer_ctrl->reg; > - __le16 val; > + __le16 val_new, val_old; > int ret; > > /* > @@ -454,13 +454,19 @@ static int da7219_tonegen_freq_put(struct > snd_kcontrol *kcontrol, > * Therefore we need to convert to little endian here to align with > * HW registers. > */ > - val = cpu_to_le16(ucontrol->value.integer.value[0]); > + val_new = cpu_to_le16(ucontrol->value.integer.value[0]); > > mutex_lock(&da7219->ctrl_lock); > - ret = regmap_raw_write(da7219->regmap, reg, &val, sizeof(val)); > + ret = regmap_raw_read(da7219->regmap, reg, &val_old, sizeof(val_old)); > + if (ret == 0) Wouldn't it make sense here to only perform the write if the values weren't the same? > + ret = regmap_raw_write(da7219->regmap, reg, > + &val_new, sizeof(val_new)); > mutex_unlock(&da7219->ctrl_lock); > > - return ret; > + if (ret < 0) > + return ret; > + > + return val_old != val_new; > } > > > -- > 2.30.2
On Sun, 17 Apr 2022 20:27:33 +0100, Mark Brown wrote: > The tone generator frequency control just returns 0 on successful write, > not a boolean value indicating if there was a change or not. Compare > what was written with the value that was there previously so that > notifications are generated appropraitely when the value changes. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: da7219: Fix change notifications for tone generator frequency commit: 08ef48404965cfef99343d6bbbcf75b88c74aa0e 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
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index a28d3601b932..c08e15830cec 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -446,7 +446,7 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol, struct soc_mixer_control *mixer_ctrl = (struct soc_mixer_control *) kcontrol->private_value; unsigned int reg = mixer_ctrl->reg; - __le16 val; + __le16 val_new, val_old; int ret; /* @@ -454,13 +454,19 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol, * Therefore we need to convert to little endian here to align with * HW registers. */ - val = cpu_to_le16(ucontrol->value.integer.value[0]); + val_new = cpu_to_le16(ucontrol->value.integer.value[0]); mutex_lock(&da7219->ctrl_lock); - ret = regmap_raw_write(da7219->regmap, reg, &val, sizeof(val)); + ret = regmap_raw_read(da7219->regmap, reg, &val_old, sizeof(val_old)); + if (ret == 0) + ret = regmap_raw_write(da7219->regmap, reg, + &val_new, sizeof(val_new)); mutex_unlock(&da7219->ctrl_lock); - return ret; + if (ret < 0) + return ret; + + return val_old != val_new; }
The tone generator frequency control just returns 0 on successful write, not a boolean value indicating if there was a change or not. Compare what was written with the value that was there previously so that notifications are generated appropraitely when the value changes. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/codecs/da7219.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)