diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-11-20 12:37:41 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-24 08:51:52 -0500 |
commit | c3e8494c001ce0bec0ebaa49c6f5eeb2aa5ab36a (patch) | |
tree | 2f2ce90e3aa1cb218476e2b462d32119c76bb372 /sound/soc/codecs/wm8962.c | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
ASoC: wm8962: Use IS_ENABLED() macro
Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm8962.c')
-rw-r--r-- | sound/soc/codecs/wm8962.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 543c5c2631b6..07da601f8343 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c | |||
@@ -74,7 +74,7 @@ struct wm8962_priv { | |||
74 | struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES]; | 74 | struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES]; |
75 | struct notifier_block disable_nb[WM8962_NUM_SUPPLIES]; | 75 | struct notifier_block disable_nb[WM8962_NUM_SUPPLIES]; |
76 | 76 | ||
77 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 77 | #if IS_ENABLED(CONFIG_INPUT) |
78 | struct input_dev *beep; | 78 | struct input_dev *beep; |
79 | struct work_struct beep_work; | 79 | struct work_struct beep_work; |
80 | int beep_rate; | 80 | int beep_rate; |
@@ -3108,7 +3108,7 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) | |||
3108 | } | 3108 | } |
3109 | EXPORT_SYMBOL_GPL(wm8962_mic_detect); | 3109 | EXPORT_SYMBOL_GPL(wm8962_mic_detect); |
3110 | 3110 | ||
3111 | #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) | 3111 | #if IS_ENABLED(CONFIG_INPUT) |
3112 | static int beep_rates[] = { | 3112 | static int beep_rates[] = { |
3113 | 500, 1000, 2000, 4000, | 3113 | 500, 1000, 2000, 4000, |
3114 | }; | 3114 | }; |