android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Remove IS_ENABLED for INPUT in CS42L52 and WM8962

Browse Source 
Now that INPUT is required for the CS42L52 and WM8962 we can remove the
IS_ENABLED(INPUT) check in the drivers.

Signed-off-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Brian Austin 2014-05-02 09:30:41 -05:00 committed by Mark Brown
parent a2915d4fef
commit c894e394d4
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/codecs/cs42l52.c
View File

@ -50,11 +50,9 @@ struct cs42l52_private {
u8 mclksel; u8 mclksel;
u32 mclk; u32 mclk;
u8 flags; u8 flags;
#if IS_ENABLED(CONFIG_INPUT)
struct input_dev *beep; struct input_dev *beep;
struct work_struct beep_work; struct work_struct beep_work;
int beep_rate; int beep_rate;
#endif
}; };
static const struct reg_default cs42l52_reg_defaults[] = { static const struct reg_default cs42l52_reg_defaults[] = {
@ -962,7 +960,6 @@ static int cs42l52_resume(struct snd_soc_codec *codec)
return 0; return 0;
} }
#if IS_ENABLED(CONFIG_INPUT)
static int beep_rates[] = { static int beep_rates[] = {
261, 522, 585, 667, 706, 774, 889, 1000, 261, 522, 585, 667, 706, 774, 889, 1000,
1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182 1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182
@ -1096,15 +1093,6 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, CS42L52_BEEP_TONE_CTL, snd_soc_update_bits(codec, CS42L52_BEEP_TONE_CTL,
CS42L52_BEEP_EN_MASK, 0); CS42L52_BEEP_EN_MASK, 0);
} }
#else
static void cs42l52_init_beep(struct snd_soc_codec *codec)
{
}
static void cs42l52_free_beep(struct snd_soc_codec *codec)
{
}
#endif
static int cs42l52_probe(struct snd_soc_codec *codec) static int cs42l52_probe(struct snd_soc_codec *codec)
{ {

12
sound/soc/codecs/wm8962.c
View File

@ -74,11 +74,9 @@ struct wm8962_priv {
struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES]; struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES];
struct notifier_block disable_nb[WM8962_NUM_SUPPLIES]; struct notifier_block disable_nb[WM8962_NUM_SUPPLIES];
#if IS_ENABLED(CONFIG_INPUT)
struct input_dev *beep; struct input_dev *beep;
struct work_struct beep_work; struct work_struct beep_work;
int beep_rate; int beep_rate;
#endif
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
struct gpio_chip gpio_chip; struct gpio_chip gpio_chip;
@ -3145,7 +3143,6 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
} }
EXPORT_SYMBOL_GPL(wm8962_mic_detect); EXPORT_SYMBOL_GPL(wm8962_mic_detect);
#if IS_ENABLED(CONFIG_INPUT)
static int beep_rates[] = { static int beep_rates[] = {
500, 1000, 2000, 4000, 500, 1000, 2000, 4000,
}; };
@ -3277,15 +3274,6 @@ static void wm8962_free_beep(struct snd_soc_codec *codec)
snd_soc_update_bits(codec, WM8962_BEEP_GENERATOR_1, WM8962_BEEP_ENA,0); snd_soc_update_bits(codec, WM8962_BEEP_GENERATOR_1, WM8962_BEEP_ENA,0);
} }
#else
static void wm8962_init_beep(struct snd_soc_codec *codec)
{
}
static void wm8962_free_beep(struct snd_soc_codec *codec)
{
}
#endif
static void wm8962_set_gpio_mode(struct wm8962_priv *wm8962, int gpio) static void wm8962_set_gpio_mode(struct wm8962_priv *wm8962, int gpio)
{ {