evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: asihpi: Use standard printk helpers

Browse source 
Signed-off-by: Eliot Blennerhassett <eliot@blennerhassett.gen.nz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Eliot Blennerhassett 2014-11-20 16:22:55 +13:00 • committed by Takashi Iwai
parent 5bc91f5b3c
commit 12eb089874
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sound/pci/asihpi/asihpi.c
View file

@ -380,7 +380,7 @@ static void snd_card_asihpi_pcm_samplerates(struct snd_card_asihpi *asihpi,
HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0, HPI_SOURCENODE_CLOCK_SOURCE, 0, 0, 0,
HPI_CONTROL_SAMPLECLOCK, &h_control); HPI_CONTROL_SAMPLECLOCK, &h_control);
if (err) { if (err) {
snd_printk(KERN_ERR dev_err(&asihpi->pci->dev,
"No local sampleclock, err %d\n", err); "No local sampleclock, err %d\n", err);
} }
@ -1438,7 +1438,7 @@ static inline int ctl_add(struct snd_card *card, struct snd_kcontrol_new *ctl,
if (err < 0) if (err < 0)
return err; return err;
else if (mixer_dump) else if (mixer_dump)
snd_printk(KERN_INFO "added %s(%d)\n", ctl->name, ctl->index); dev_info(&asihpi->pci->dev, "added %s(%d)\n", ctl->name, ctl->index);
return 0; return 0;
} }
@ -2652,7 +2652,7 @@ static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
if (err) { if (err) {
if (err == HPI_ERROR_CONTROL_DISABLED) { if (err == HPI_ERROR_CONTROL_DISABLED) {
if (mixer_dump) if (mixer_dump)
snd_printk(KERN_INFO dev_info(&asihpi->pci->dev,
"Disabled HPI Control(%d)\n", "Disabled HPI Control(%d)\n",
idx); idx);
continue; continue;
@ -2717,9 +2717,8 @@ static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
case HPI_CONTROL_COMPANDER: case HPI_CONTROL_COMPANDER:
default: default:
if (mixer_dump) if (mixer_dump)
snd_printk(KERN_INFO dev_info(&asihpi->pci->dev,
"Untranslated HPI Control" "Untranslated HPI Control (%d) %d %d %d %d %d\n",
"(%d) %d %d %d %d %d\n",
idx, idx,
hpi_ctl.control_type, hpi_ctl.control_type,
hpi_ctl.src_node_type, hpi_ctl.src_node_type,
@ -2734,7 +2733,7 @@ static int snd_card_asihpi_mixer_new(struct snd_card_asihpi *asihpi)
if (HPI_ERROR_INVALID_OBJ_INDEX != err) if (HPI_ERROR_INVALID_OBJ_INDEX != err)
hpi_handle_error(err); hpi_handle_error(err);
snd_printk(KERN_INFO "%d mixer controls found\n", idx); dev_info(&asihpi->pci->dev, "%d mixer controls found\n", idx);
return 0; return 0;
} }
@ -2897,8 +2896,7 @@ static int snd_asihpi_probe(struct pci_dev *pci_dev,
&card); &card);
if (err < 0) if (err < 0)
return err; return err;
snd_printk(KERN_WARNING dev_warn(&pci_dev->dev, "Adapter index %d->ALSA index %d\n",
"**** WARNING **** Adapter index %d->ALSA index %d\n",
adapter_index, card->number); adapter_index, card->number);
} }
@ -2908,9 +2906,6 @@ static int snd_asihpi_probe(struct pci_dev *pci_dev,
asihpi->hpi = hpi; asihpi->hpi = hpi;
hpi->snd_card = card; hpi->snd_card = card;
snd_printk(KERN_INFO "adapter ID=%4X index=%d\n",
asihpi->hpi->adapter->type, adapter_index);
err = hpi_adapter_get_property(adapter_index, err = hpi_adapter_get_property(adapter_index,
HPI_ADAPTER_PROPERTY_CAPS1, HPI_ADAPTER_PROPERTY_CAPS1,
NULL, &asihpi->support_grouping); NULL, &asihpi->support_grouping);
@ -2968,22 +2963,21 @@ static int snd_asihpi_probe(struct pci_dev *pci_dev,
asihpi->in_min_chans = 1; asihpi->in_min_chans = 1;
} }
snd_printk(KERN_INFO "update_interval_frames: %d", dev_info(&pci_dev->dev, "Has dma:%d, grouping:%d, mrx:%d, uif:%d\n",
asihpi->update_interval_frames);
snd_printk(KERN_INFO "Has dma:%d, grouping:%d, mrx:%d\n",
asihpi->can_dma, asihpi->can_dma,
asihpi->support_grouping, asihpi->support_grouping,
asihpi->support_mrx asihpi->support_mrx,
asihpi->update_interval_frames
); );
err = snd_card_asihpi_pcm_new(asihpi, 0); err = snd_card_asihpi_pcm_new(asihpi, 0);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "pcm_new failed\n"); dev_err(&pci_dev->dev, "pcm_new failed\n");
goto __nodev; goto __nodev;
} }
err = snd_card_asihpi_mixer_new(asihpi); err = snd_card_asihpi_mixer_new(asihpi);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "mixer_new failed\n"); dev_err(&pci_dev->dev, "mixer_new failed\n");
goto __nodev; goto __nodev;
} }
@ -3015,7 +3009,7 @@ static int snd_asihpi_probe(struct pci_dev *pci_dev,
} }
__nodev: __nodev:
snd_card_free(card); snd_card_free(card);
snd_printk(KERN_ERR "snd_asihpi_probe error %d\n", err); dev_err(&pci_dev->dev, "snd_asihpi_probe error %d\n", err);
return err; return err;
} }