Commit c894e394 authored by Brian Austin's avatar Brian Austin Committed by Mark Brown
Browse files

ASoC: Remove IS_ENABLED for INPUT in CS42L52 and WM8962 



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

Signed-off-by: default avatarBrian Austin <brian.austin@cirrus.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a2915d4f

sound/soc/codecs/cs42l52.c

+0 −12
Original line number Diff line number Diff line
@@ -50,11 +50,9 @@ struct cs42l52_private { 
	u8 mclksel;

	u32 mclk;

	u8 flags;

#if IS_ENABLED(CONFIG_INPUT)

	struct input_dev *beep;

	struct work_struct beep_work;

	int beep_rate;

#endif

};



static const struct reg_default cs42l52_reg_defaults[] = {
@@ -962,7 +960,6 @@ static int cs42l52_resume(struct snd_soc_codec *codec) 
	return 0;

}



#if IS_ENABLED(CONFIG_INPUT)

static int beep_rates[] = {

	261, 522, 585, 667, 706, 774, 889, 1000,

	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,

			    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)

{

sound/soc/codecs/wm8962.c

+0 −12
Original line number Diff line number Diff line
@@ -74,11 +74,9 @@ struct wm8962_priv { 
	struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES];

	struct notifier_block disable_nb[WM8962_NUM_SUPPLIES];



#if IS_ENABLED(CONFIG_INPUT)

	struct input_dev *beep;

	struct work_struct beep_work;

	int beep_rate;

#endif



#ifdef CONFIG_GPIOLIB

	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);



#if IS_ENABLED(CONFIG_INPUT)

static int beep_rates[] = {

	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);

}

#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)

{