1 files changed, 1 insertions, 20 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 8d20f6ec20f3..64d2a4fa34b2 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -802,8 +802,7 @@ static int aic3x_hw_params(struct snd_pcm_substream *substream,
                            struct snd_pcm_hw_params *params,
                            struct snd_soc_dai *dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_codec *codec =rtd->codec;
+        struct snd_soc_codec *codec = dai->codec;
         struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
         int codec_clk = 0, bypass_pll = 0, fsref, last_clk = 0;
         u8 data, j, r, p, pll_q, pll_p = 1, pll_r = 1, pll_j = 1;
@@ -1161,24 +1160,6 @@ static int aic3x_set_bias_level(struct snd_soc_codec *codec,
         return 0;
 }
 
-void aic3x_set_headset_detection(struct snd_soc_codec *codec, int detect,
-                                 int headset_debounce, int button_debounce)
-{
-        u8 val;
-
-        val = ((detect & AIC3X_HEADSET_DETECT_MASK)
-                << AIC3X_HEADSET_DETECT_SHIFT) |
-              ((headset_debounce & AIC3X_HEADSET_DEBOUNCE_MASK)
-                << AIC3X_HEADSET_DEBOUNCE_SHIFT) |
-              ((button_debounce & AIC3X_BUTTON_DEBOUNCE_MASK)
-                << AIC3X_BUTTON_DEBOUNCE_SHIFT);
-
-        if (detect & AIC3X_HEADSET_DETECT_MASK)
-                val |= AIC3X_HEADSET_DETECT_ENABLED;
-
-        snd_soc_write(codec, AIC3X_HEADSET_DETECT_CTRL_A, val);
-}
-
 #define AIC3X_RATES     SNDRV_PCM_RATE_8000_96000
 #define AIC3X_FORMATS   (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
                          SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)