diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-01-10 18:00:34 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-10 18:45:56 +0300 |
| commit | d2119c05e9aee7e44055220726bb8814a2e242c3 (patch) | |
| tree | 9b7df8933baf437bb477a5ad9e6b222a886acf9a /sound/pci/oxygen | |
| parent | 1f4d7be7293aecd5f8469a46f606f62f0f05d84c (diff) | |
| download | linux-d2119c05e9aee7e44055220726bb8814a2e242c3.tar.xz | |
ALSA: oxygen: remove oxygen_model::private_data field
The number of DACs can now be deduced from the dac_channels_mixer field,
so the private_data field is no longer needed.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen')
| -rw-r--r-- | sound/pci/oxygen/oxygen.h | 1 | ||||
| -rw-r--r-- | sound/pci/oxygen/xonar_pcm179x.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 3d9535c2debb..70eff3747158 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h @@ -97,7 +97,6 @@ struct oxygen_model { void (*dump_registers)(struct oxygen *chip, struct snd_info_buffer *buffer); const unsigned int *dac_tlv; - unsigned long private_data; size_t model_data_size; unsigned int device_config; u8 dac_channels_pcm; diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c index b55149e9be81..5ec8be3bf7c7 100644 --- a/sound/pci/oxygen/xonar_pcm179x.c +++ b/sound/pci/oxygen/xonar_pcm179x.c @@ -381,7 +381,7 @@ static void xonar_hdav_init(struct oxygen *chip) data->pcm179x.generic.ext_power_reg = OXYGEN_GPI_DATA; data->pcm179x.generic.ext_power_int_reg = OXYGEN_GPI_INTERRUPT_MASK; data->pcm179x.generic.ext_power_bit = GPI_EXT_POWER; - data->pcm179x.dacs = chip->model.private_data ? 4 : 1; + data->pcm179x.dacs = chip->model.dac_channels_mixer / 2; pcm1796_init(chip); @@ -411,7 +411,7 @@ static void xonar_st_init_common(struct oxygen *chip) struct xonar_pcm179x *data = chip->model_data; data->generic.output_enable_bit = GPIO_ST_OUTPUT_ENABLE; - data->dacs = chip->model.private_data ? 4 : 1; + data->dacs = chip->model.dac_channels_mixer / 2; data->hp_gain_offset = 2*-18; pcm1796_init(chip); @@ -1191,7 +1191,6 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip, case GPIO_DB_H6: chip->model.shortname = "Xonar HDAV1.3+H6"; chip->model.dac_channels_mixer = 8; - chip->model.private_data = 1; break; } break; @@ -1206,7 +1205,6 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip, chip->model.shortname = "Xonar ST+H6"; chip->model.dac_channels_pcm = 8; chip->model.dac_channels_mixer = 8; - chip->model.private_data = 1; break; } break; |