lkml.org 
[lkml]   [2021]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 09/64] ASoC: cs42l42: Remove duplicate control for WNF filter frequency
    Date
    From: Richard Fitzgerald <rf@opensource.cirrus.com>

    [ Upstream commit 8b353bbeae20e2214c9d9d88bcb2fda4ba145d83 ]

    The driver was defining two ALSA controls that both change the same
    register field for the wind noise filter corner frequency. The filter
    response has two corners, at different frequencies, and the duplicate
    controls most likely were an attempt to be able to set the value using
    either of the frequencies.

    However, having two controls changing the same field can be problematic
    and it is unnecessary. Both frequencies are related to each other so
    setting one implies exactly what the other would be.

    Removing a control affects user-side code, but there is currently no
    known use of the removed control so it would be best to remove it now
    before it becomes a problem.

    Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
    Fixes: 2c394ca79604 ("ASoC: Add support for CS42L42 codec")
    Link: https://lore.kernel.org/r/20210803160834.9005-2-rf@opensource.cirrus.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/cs42l42.c | 10 ----------
    1 file changed, 10 deletions(-)

    diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c
    index 52f51b86af91..e6eeecc5446e 100644
    --- a/sound/soc/codecs/cs42l42.c
    +++ b/sound/soc/codecs/cs42l42.c
    @@ -424,15 +424,6 @@ static SOC_ENUM_SINGLE_DECL(cs42l42_wnf3_freq_enum, CS42L42_ADC_WNF_HPF_CTL,
    CS42L42_ADC_WNF_CF_SHIFT,
    cs42l42_wnf3_freq_text);

    -static const char * const cs42l42_wnf05_freq_text[] = {
    - "280Hz", "315Hz", "350Hz", "385Hz",
    - "420Hz", "455Hz", "490Hz", "525Hz"
    -};
    -
    -static SOC_ENUM_SINGLE_DECL(cs42l42_wnf05_freq_enum, CS42L42_ADC_WNF_HPF_CTL,
    - CS42L42_ADC_WNF_CF_SHIFT,
    - cs42l42_wnf05_freq_text);
    -
    static const struct snd_kcontrol_new cs42l42_snd_controls[] = {
    /* ADC Volume and Filter Controls */
    SOC_SINGLE("ADC Notch Switch", CS42L42_ADC_CTL,
    @@ -450,7 +441,6 @@ static const struct snd_kcontrol_new cs42l42_snd_controls[] = {
    CS42L42_ADC_HPF_EN_SHIFT, true, false),
    SOC_ENUM("HPF Corner Freq", cs42l42_hpf_freq_enum),
    SOC_ENUM("WNF 3dB Freq", cs42l42_wnf3_freq_enum),
    - SOC_ENUM("WNF 05dB Freq", cs42l42_wnf05_freq_enum),

    /* DAC Volume and Filter Controls */
    SOC_SINGLE("DACA Invert Switch", CS42L42_DAC_CTL1,
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-08-24 19:30    [W:4.190 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site