diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index d9739d8d781237d8b8803b5523e90984765c86d4..585905bddbdd9ac1080a91497649b1e80fd69ed5 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -54,8 +54,6 @@ struct imx_priv { struct platform_device *pdev; struct snd_pcm_substream *first_stream; struct snd_pcm_substream *second_stream; - struct snd_kcontrol *headphone_kctl; - struct snd_card *snd_card; struct platform_device *asrc_pdev; u32 asrc_rate; u32 asrc_format; @@ -117,12 +115,10 @@ static int hpjack_status_check(void *data) snprintf(buf, 32, "STATE=%d", 2); snd_soc_dapm_disable_pin(snd_soc_codec_get_dapm(priv->codec), "Ext Spk"); ret = imx_hp_jack_gpio.report; - snd_kctl_jack_report(priv->snd_card, priv->headphone_kctl, 1); } else { snprintf(buf, 32, "STATE=%d", 0); snd_soc_dapm_enable_pin(snd_soc_codec_get_dapm(priv->codec), "Ext Spk"); ret = 0; - snd_kctl_jack_report(priv->snd_card, priv->headphone_kctl, 0); } envp[0] = "NAME=headphone"; @@ -779,12 +775,6 @@ audmux_bypass: goto clk_fail; } - priv->snd_card = data->card.snd_card; - priv->headphone_kctl = snd_kctl_jack_new("Headphone", NULL); - ret = snd_ctl_add(data->card.snd_card, priv->headphone_kctl); - if (ret) - goto fail; - imx_wm8962_gpio_init(&data->card); if (gpio_is_valid(priv->hp_gpio)) {