| Message ID | 57a89cc31eb2312addd3c77896d7df8206aef138.1635967035.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 95cead06866a95baf0f8355bba81a8142d5908cf |
| Headers | show |
| Series | ASoC: codecs: Axe some dead code in 'wcd_mbhc_adc_hs_rem_irq()' | expand |
On 03/11/2021 19:19, Christophe JAILLET wrote: > 'hphpa_on' is know to be false, so this is just dead code that should be > removed. > > Suggested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Thanks for the patch, Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --srini > --- > This patch is a follow-up of: > https://lore.kernel.org/kernel-janitors/988948f7f266aa00698704687537335b7e6a67b2.1634455711.git.christophe.jaillet@wanadoo.fr/ > --- > sound/soc/codecs/wcd-mbhc-v2.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c > index 405128ccb4b0..b905eb8f3c67 100644 > --- a/sound/soc/codecs/wcd-mbhc-v2.c > +++ b/sound/soc/codecs/wcd-mbhc-v2.c > @@ -1176,7 +1176,6 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) > struct wcd_mbhc *mbhc = data; > unsigned long timeout; > int adc_threshold, output_mv, retry = 0; > - bool hphpa_on = false; > > mutex_lock(&mbhc->lock); > timeout = jiffies + msecs_to_jiffies(WCD_FAKE_REMOVAL_MIN_PERIOD_MS); > @@ -1210,10 +1209,6 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) > wcd_mbhc_elec_hs_report_unplug(mbhc); > wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_ISRC_CTL, 0); > > - if (hphpa_on) { > - hphpa_on = false; > - wcd_mbhc_write_field(mbhc, WCD_MBHC_HPH_PA_EN, 3); > - } > exit: > mutex_unlock(&mbhc->lock); > return IRQ_HANDLED; >
On Wed, 3 Nov 2021 20:19:27 +0100, Christophe JAILLET wrote: > 'hphpa_on' is know to be false, so this is just dead code that should be > removed. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: codecs: Axe some dead code in 'wcd_mbhc_adc_hs_rem_irq()' commit: 95cead06866a95baf0f8355bba81a8142d5908cf 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/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c index 405128ccb4b0..b905eb8f3c67 100644 --- a/sound/soc/codecs/wcd-mbhc-v2.c +++ b/sound/soc/codecs/wcd-mbhc-v2.c @@ -1176,7 +1176,6 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) struct wcd_mbhc *mbhc = data; unsigned long timeout; int adc_threshold, output_mv, retry = 0; - bool hphpa_on = false; mutex_lock(&mbhc->lock); timeout = jiffies + msecs_to_jiffies(WCD_FAKE_REMOVAL_MIN_PERIOD_MS); @@ -1210,10 +1209,6 @@ static irqreturn_t wcd_mbhc_adc_hs_rem_irq(int irq, void *data) wcd_mbhc_elec_hs_report_unplug(mbhc); wcd_mbhc_write_field(mbhc, WCD_MBHC_BTN_ISRC_CTL, 0); - if (hphpa_on) { - hphpa_on = false; - wcd_mbhc_write_field(mbhc, WCD_MBHC_HPH_PA_EN, 3); - } exit: mutex_unlock(&mbhc->lock); return IRQ_HANDLED;
'hphpa_on' is know to be false, so this is just dead code that should be removed. Suggested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- This patch is a follow-up of: https://lore.kernel.org/kernel-janitors/988948f7f266aa00698704687537335b7e6a67b2.1634455711.git.christophe.jaillet@wanadoo.fr/ --- sound/soc/codecs/wcd-mbhc-v2.c | 5 ----- 1 file changed, 5 deletions(-)