aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-09-22 03:07:20 -0400
committerClemens Ladisch <clemens@ladisch.de>2008-09-22 03:07:20 -0400
commitc871c4a83abaf6caedeff1c502e2c10fd88cbb54 (patch)
tree60afd6d7927507174bcec0e5d564e9de4918e36e
parent70c27d345ed74ca9ea7ebf1fa0186af644caeb1d (diff)
ALSA: virtuoso: rename AC97 callback function
Rename the callback function that switches between line and mic inputs on the Xonar D1 because it is also usable on other models. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
-rw-r--r--sound/pci/oxygen/virtuoso.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 0cecf1f9717..928283de6f3 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -529,8 +529,8 @@ static const struct snd_kcontrol_new front_panel_switch = {
529 .private_value = GPIO_DX_FRONT_PANEL, 529 .private_value = GPIO_DX_FRONT_PANEL,
530}; 530};
531 531
532static void xonar_d1_ac97_switch(struct oxygen *chip, 532static void xonar_line_mic_ac97_switch(struct oxygen *chip,
533 unsigned int reg, unsigned int mute) 533 unsigned int reg, unsigned int mute)
534{ 534{
535 if (reg == AC97_LINE) { 535 if (reg == AC97_LINE) {
536 spin_lock_irq(&chip->reg_lock); 536 spin_lock_irq(&chip->reg_lock);
@@ -640,7 +640,7 @@ static const struct oxygen_model model_xonar_d1 = {
640 .set_adc_params = set_cs53x1_params, 640 .set_adc_params = set_cs53x1_params,
641 .update_dac_volume = update_cs43xx_volume, 641 .update_dac_volume = update_cs43xx_volume,
642 .update_dac_mute = update_cs43xx_mute, 642 .update_dac_mute = update_cs43xx_mute,
643 .ac97_switch = xonar_d1_ac97_switch, 643 .ac97_switch = xonar_line_mic_ac97_switch,
644 .dac_tlv = cs4362a_db_scale, 644 .dac_tlv = cs4362a_db_scale,
645 .model_data_size = sizeof(struct xonar_data), 645 .model_data_size = sizeof(struct xonar_data),
646 .device_config = PLAYBACK_0_TO_I2S | 646 .device_config = PLAYBACK_0_TO_I2S |