aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-23 14:50:45 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-03 18:03:57 -0400
commita7892c35cfad4d6c6ccf1242b55c1004b0d5d1d1 (patch)
tree0d89797913d21f101a54c3720acb22bb56c50613 /sound/soc/codecs
parentfae4efa23ac012a57d45682bc22d540271c54532 (diff)
ASoC: wm_hubs: Rename calibrate_dc_servo()
Really we're enabling it here and the name will become very confusing shortly. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm_hubs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 6ab69f32f249..05a02e1b7e92 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -243,7 +243,7 @@ static void wm_hubs_read_dc_servo(struct snd_soc_codec *codec,
243/* 243/*
244 * Startup calibration of the DC servo 244 * Startup calibration of the DC servo
245 */ 245 */
246static void calibrate_dc_servo(struct snd_soc_codec *codec) 246static void enable_dc_servo(struct snd_soc_codec *codec)
247{ 247{
248 struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); 248 struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
249 struct wm_hubs_dcs_cache *cache; 249 struct wm_hubs_dcs_cache *cache;
@@ -556,7 +556,7 @@ static int hp_event(struct snd_soc_dapm_widget *w,
556 snd_soc_update_bits(codec, WM8993_DC_SERVO_1, 556 snd_soc_update_bits(codec, WM8993_DC_SERVO_1,
557 WM8993_DCS_TIMER_PERIOD_01_MASK, 0); 557 WM8993_DCS_TIMER_PERIOD_01_MASK, 0);
558 558
559 calibrate_dc_servo(codec); 559 enable_dc_servo(codec);
560 560
561 reg |= WM8993_HPOUT1R_OUTP | WM8993_HPOUT1R_RMV_SHORT | 561 reg |= WM8993_HPOUT1R_OUTP | WM8993_HPOUT1R_RMV_SHORT |
562 WM8993_HPOUT1L_OUTP | WM8993_HPOUT1L_RMV_SHORT; 562 WM8993_HPOUT1L_OUTP | WM8993_HPOUT1L_RMV_SHORT;