Revert "ASoC: msm8960: Add module MBHC module parameters"
This reverts commit b727b09aaf3fce379c9e9fcb15ce595fbf0edb0f
diff --git a/sound/soc/msm/msm8960.c b/sound/soc/msm/msm8960.c
index a7dad6b..9f70ee2 100644
--- a/sound/soc/msm/msm8960.c
+++ b/sound/soc/msm/msm8960.c
@@ -61,6 +61,7 @@
#define JACK_DETECT_GPIO 38
#define JACK_DETECT_INT PM8921_GPIO_IRQ(PM8921_IRQ_BASE, JACK_DETECT_GPIO)
+#define GPIO_DETECT_USED false
static u32 top_spk_pamp_gpio = PM8921_GPIO_PM_TO_SYS(18);
static u32 bottom_spk_pamp_gpio = PM8921_GPIO_PM_TO_SYS(19);
@@ -81,14 +82,6 @@
static struct snd_soc_jack hs_jack;
static struct snd_soc_jack button_jack;
-static bool hs_detect_use_gpio;
-module_param(hs_detect_use_gpio, bool, 0444);
-MODULE_PARM_DESC(hs_detect_use_gpio, "Use GPIO for headset detection");
-
-static bool hs_detect_use_firmware;
-module_param(hs_detect_use_firmware, bool, 0444);
-MODULE_PARM_DESC(hs_detect_use_firmware, "Use firmware for headset detection");
-
static int msm8960_enable_codec_ext_clk(struct snd_soc_codec *codec, int enable,
bool dapm);
@@ -796,7 +789,7 @@
codec_clk = clk_get(cpu_dai->dev, "osr_clk");
- if (hs_detect_use_gpio) {
+ if (GPIO_DETECT_USED) {
mbhc_cfg.gpio = PM8921_GPIO_PM_TO_SYS(JACK_DETECT_GPIO);
mbhc_cfg.gpio_irq = JACK_DETECT_INT;
}
@@ -809,9 +802,6 @@
return err;
}
}
-
- mbhc_cfg.read_fw_bin = hs_detect_use_firmware;
-
err = tabla_hs_detect(codec, &mbhc_cfg);
return err;