diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-06-06 12:12:16 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-06-25 08:51:23 -0400 |
commit | 6194b99de9f52b9953b7cf2b48ce0da9276af9c3 (patch) | |
tree | 59f288253169717f17c00d0282c9c1b626cb5a05 /sound/pci/hda/patch_ca0132.c | |
parent | 79514d473b097da82f5bc0b4e41251c44e29d98c (diff) |
ALSA: hda - Kill the rest of snd_print*() usages
Pass the codec object so that we can replace all the rest of
snd_print*() usages with the proper device-specific print helpers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_ca0132.c')
-rw-r--r-- | sound/pci/hda/patch_ca0132.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 092f2bd030bd..4f3aba78f720 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c | |||
@@ -2046,14 +2046,14 @@ enum dma_state { | |||
2046 | DMA_STATE_RUN = 1 | 2046 | DMA_STATE_RUN = 1 |
2047 | }; | 2047 | }; |
2048 | 2048 | ||
2049 | static int dma_convert_to_hda_format( | 2049 | static int dma_convert_to_hda_format(struct hda_codec *codec, |
2050 | unsigned int sample_rate, | 2050 | unsigned int sample_rate, |
2051 | unsigned short channels, | 2051 | unsigned short channels, |
2052 | unsigned short *hda_format) | 2052 | unsigned short *hda_format) |
2053 | { | 2053 | { |
2054 | unsigned int format_val; | 2054 | unsigned int format_val; |
2055 | 2055 | ||
2056 | format_val = snd_hda_calc_stream_format( | 2056 | format_val = snd_hda_calc_stream_format(codec, |
2057 | sample_rate, | 2057 | sample_rate, |
2058 | channels, | 2058 | channels, |
2059 | SNDRV_PCM_FORMAT_S32_LE, | 2059 | SNDRV_PCM_FORMAT_S32_LE, |
@@ -2452,7 +2452,7 @@ static int dspxfr_image(struct hda_codec *codec, | |||
2452 | } | 2452 | } |
2453 | 2453 | ||
2454 | dma_engine->codec = codec; | 2454 | dma_engine->codec = codec; |
2455 | dma_convert_to_hda_format(sample_rate, channels, &hda_format); | 2455 | dma_convert_to_hda_format(codec, sample_rate, channels, &hda_format); |
2456 | dma_engine->m_converter_format = hda_format; | 2456 | dma_engine->m_converter_format = hda_format; |
2457 | dma_engine->buf_size = (ovly ? DSP_DMA_WRITE_BUFLEN_OVLY : | 2457 | dma_engine->buf_size = (ovly ? DSP_DMA_WRITE_BUFLEN_OVLY : |
2458 | DSP_DMA_WRITE_BUFLEN_INIT) * 2; | 2458 | DSP_DMA_WRITE_BUFLEN_INIT) * 2; |