diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2014-09-29 14:33:26 +0530 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-30 10:36:59 +0200 |
| commit | 0cae90a96c15f2fd3bd139ba5505755c9c9ef2eb (patch) | |
| tree | 36432fccc1f0898a62bcc083d41cbe10e3075f4c /sound/pci/ctxfi/ctmixer.c | |
| parent | a45c4d5142595a9b7907499f6d67f702bc20aeb4 (diff) | |
| download | talos-op-linux-0cae90a96c15f2fd3bd139ba5505755c9c9ef2eb.tar.gz talos-op-linux-0cae90a96c15f2fd3bd139ba5505755c9c9ef2eb.zip | |
ALSA: ctxfi: pr_* replaced with dev_*
pr_* macros replaced with dev_* as they are more preffered over pr_*.
each file which had pr_* was reviewed manually and replaced with dev_*.
here we have actually used the various snd_card which was added to some
structures of ctxfi via a previous patch of this series.
in the ctvmem.c file we have passed a reference of ct_atc as an
argument to get_vm_block function so that it can be used from
dev_*.
since dev_* will print the device information , so the prefix of
"ctxfi" from the various pr_* were also removed.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/ctmixer.c')
| -rw-r--r-- | sound/pci/ctxfi/ctmixer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c index 017fa91706d4..4f4a2a5dedb8 100644 --- a/sound/pci/ctxfi/ctmixer.c +++ b/sound/pci/ctxfi/ctmixer.c @@ -854,7 +854,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer) for (i = 0; i < (NUM_CT_SUMS * CHN_NUM); i++) { err = sum_mgr->get_sum(sum_mgr, &sum_desc, &sum); if (err) { - pr_err("ctxfi:Failed to get sum resources for front output!\n"); + dev_err(mixer->atc->card->dev, + "Failed to get sum resources for front output!\n"); break; } mixer->sums[i] = sum; @@ -868,7 +869,8 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer) for (i = 0; i < (NUM_CT_AMIXERS * CHN_NUM); i++) { err = amixer_mgr->get_amixer(amixer_mgr, &am_desc, &amixer); if (err) { - pr_err("ctxfi:Failed to get amixer resources for mixer obj!\n"); + dev_err(mixer->atc->card->dev, + "Failed to get amixer resources for mixer obj!\n"); break; } mixer->amixers[i] = amixer; |
