diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-04-16 09:15:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 12:00:37 +0200 |
| commit | 4972a177fed34036498aee555335f84a70219bc1 (patch) | |
| tree | 343c9beb57407db5111d88de2c9c97498bc91777 /sound/pci/oxygen/hifier.c | |
| parent | [ALSA] oxygen: mute by default (diff) | |
| download | linux-4972a177fed34036498aee555335f84a70219bc1.tar.xz linux-4972a177fed34036498aee555335f84a70219bc1.zip | |
[ALSA] oxygen: generalize DAC volume TLV handling
Add a pointer for DAC volume TLV data to the model structure so that the
model driver do not need to manually assign it in their control filter.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/hifier.c')
| -rw-r--r-- | sound/pci/oxygen/hifier.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c index dec9073d6ed1..090dd4354a28 100644 --- a/sound/pci/oxygen/hifier.c +++ b/sound/pci/oxygen/hifier.c @@ -127,12 +127,8 @@ static const DECLARE_TLV_DB_LINEAR(ak4396_db_scale, TLV_DB_GAIN_MUTE, 0); static int hifier_control_filter(struct snd_kcontrol_new *template) { - if (!strcmp(template->name, "Master Playback Volume")) { - template->access |= SNDRV_CTL_ELEM_ACCESS_TLV_READ; - template->tlv.p = ak4396_db_scale; - } else if (!strcmp(template->name, "Stereo Upmixing")) { + if (!strcmp(template->name, "Stereo Upmixing")) return 1; /* stereo only - we don't need upmixing */ - } return 0; } @@ -148,6 +144,7 @@ static const struct oxygen_model model_hifier = { .set_adc_params = set_cs5340_params, .update_dac_volume = update_ak4396_volume, .update_dac_mute = update_ak4396_mute, + .dac_tlv = ak4396_db_scale, .model_data_size = sizeof(struct hifier_data), .pcm_dev_cfg = PLAYBACK_0_TO_I2S | PLAYBACK_1_TO_SPDIF | |