summaryrefslogtreecommitdiff
path: root/sound/pci/hda/patch_ca0132.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-06-06 16:12:16 (GMT)
committerTakashi Iwai <tiwai@suse.de>2014-06-25 12:51:23 (GMT)
commit6194b99de9f52b9953b7cf2b48ce0da9276af9c3 (patch)
tree59f288253169717f17c00d0282c9c1b626cb5a05 /sound/pci/hda/patch_ca0132.c
parent79514d473b097da82f5bc0b4e41251c44e29d98c (diff)
downloadlinux-6194b99de9f52b9953b7cf2b48ce0da9276af9c3.tar.xz
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 092f2bd..4f3aba7 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -2046,14 +2046,14 @@ enum dma_state {
DMA_STATE_RUN = 1
};
-static int dma_convert_to_hda_format(
+static int dma_convert_to_hda_format(struct hda_codec *codec,
unsigned int sample_rate,
unsigned short channels,
unsigned short *hda_format)
{
unsigned int format_val;
- format_val = snd_hda_calc_stream_format(
+ format_val = snd_hda_calc_stream_format(codec,
sample_rate,
channels,
SNDRV_PCM_FORMAT_S32_LE,
@@ -2452,7 +2452,7 @@ static int dspxfr_image(struct hda_codec *codec,
}
dma_engine->codec = codec;
- dma_convert_to_hda_format(sample_rate, channels, &hda_format);
+ dma_convert_to_hda_format(codec, sample_rate, channels, &hda_format);
dma_engine->m_converter_format = hda_format;
dma_engine->buf_size = (ovly ? DSP_DMA_WRITE_BUFLEN_OVLY :
DSP_DMA_WRITE_BUFLEN_INIT) * 2;