Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: hdspm: Use standard printk helpers

Convert with dev_err() and co from snd_printk(), etc.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

+69 -56
+69 -56
sound/pci/rme9652/hdspm.c
··· 1651 1651 just make a warning an remember setting 1652 1652 for future master mode switching */ 1653 1653 1654 - snd_printk(KERN_WARNING "HDSPM: " 1655 - "Warning: device is not running " 1656 - "as a clock master.\n"); 1654 + dev_warn(hdspm->card->dev, 1655 + "Warning: device is not running as a clock master.\n"); 1657 1656 not_set = 1; 1658 1657 } else { 1659 1658 ··· 1663 1664 if (hdspm_autosync_ref(hdspm) == 1664 1665 HDSPM_AUTOSYNC_FROM_NONE) { 1665 1666 1666 - snd_printk(KERN_WARNING "HDSPM: " 1667 - "Detected no Externel Sync \n"); 1667 + dev_warn(hdspm->card->dev, 1668 + "Detected no Externel Sync\n"); 1668 1669 not_set = 1; 1669 1670 1670 1671 } else if (rate != external_freq) { 1671 1672 1672 - snd_printk(KERN_WARNING "HDSPM: " 1673 - "Warning: No AutoSync source for " 1674 - "requested rate\n"); 1673 + dev_warn(hdspm->card->dev, 1674 + "Warning: No AutoSync source for requested rate\n"); 1675 1675 not_set = 1; 1676 1676 } 1677 1677 } ··· 1736 1738 1737 1739 if (current_speed != target_speed 1738 1740 && (hdspm->capture_pid >= 0 || hdspm->playback_pid >= 0)) { 1739 - snd_printk 1740 - (KERN_ERR "HDSPM: " 1741 - "cannot change from %s speed to %s speed mode " 1742 - "(capture PID = %d, playback PID = %d)\n", 1743 - hdspm_speed_names[current_speed], 1744 - hdspm_speed_names[target_speed], 1745 - hdspm->capture_pid, hdspm->playback_pid); 1741 + dev_err(hdspm->card->dev, 1742 + "cannot change from %s speed to %s speed mode (capture PID = %d, playback PID = %d)\n", 1743 + hdspm_speed_names[current_speed], 1744 + hdspm_speed_names[target_speed], 1745 + hdspm->capture_pid, hdspm->playback_pid); 1746 1746 return -EBUSY; 1747 1747 } 1748 1748 ··· 5442 5446 * 0 64 ~3998231 ~8191558 5443 5447 **/ 5444 5448 /* 5445 - snd_printk(KERN_INFO "snd_hdspm_interrupt %llu @ %llx\n", 5449 + dev_info(hdspm->card->dev, "snd_hdspm_interrupt %llu @ %llx\n", 5446 5450 now-hdspm->last_interrupt, status & 0xFFC0); 5447 5451 hdspm->last_interrupt = now; 5448 5452 */ ··· 5579 5583 spin_lock_irq(&hdspm->lock); 5580 5584 err = hdspm_set_rate(hdspm, params_rate(params), 0); 5581 5585 if (err < 0) { 5582 - snd_printk(KERN_INFO "err on hdspm_set_rate: %d\n", err); 5586 + dev_info(hdspm->card->dev, "err on hdspm_set_rate: %d\n", err); 5583 5587 spin_unlock_irq(&hdspm->lock); 5584 5588 _snd_pcm_hw_param_setempty(params, 5585 5589 SNDRV_PCM_HW_PARAM_RATE); ··· 5590 5594 err = hdspm_set_interrupt_interval(hdspm, 5591 5595 params_period_size(params)); 5592 5596 if (err < 0) { 5593 - snd_printk(KERN_INFO "err on hdspm_set_interrupt_interval: %d\n", err); 5597 + dev_info(hdspm->card->dev, 5598 + "err on hdspm_set_interrupt_interval: %d\n", err); 5594 5599 _snd_pcm_hw_param_setempty(params, 5595 5600 SNDRV_PCM_HW_PARAM_PERIOD_SIZE); 5596 5601 return err; ··· 5607 5610 err = 5608 5611 snd_pcm_lib_malloc_pages(substream, HDSPM_DMA_AREA_BYTES); 5609 5612 if (err < 0) { 5610 - snd_printk(KERN_INFO "err on snd_pcm_lib_malloc_pages: %d\n", err); 5613 + dev_info(hdspm->card->dev, 5614 + "err on snd_pcm_lib_malloc_pages: %d\n", err); 5611 5615 return err; 5612 5616 } 5613 5617 ··· 5622 5624 5623 5625 hdspm->playback_buffer = 5624 5626 (unsigned char *) substream->runtime->dma_area; 5625 - snd_printdd("Allocated sample buffer for playback at %p\n", 5627 + dev_dbg(hdspm->card->dev, 5628 + "Allocated sample buffer for playback at %p\n", 5626 5629 hdspm->playback_buffer); 5627 5630 } else { 5628 5631 hdspm_set_sgbuf(hdspm, substream, HDSPM_pageAddressBufferIn, ··· 5634 5635 5635 5636 hdspm->capture_buffer = 5636 5637 (unsigned char *) substream->runtime->dma_area; 5637 - snd_printdd("Allocated sample buffer for capture at %p\n", 5638 + dev_dbg(hdspm->card->dev, 5639 + "Allocated sample buffer for capture at %p\n", 5638 5640 hdspm->capture_buffer); 5639 5641 } 5640 5642 5641 5643 /* 5642 - snd_printdd("Allocated sample buffer for %s at 0x%08X\n", 5644 + dev_dbg(hdspm->card->dev, 5645 + "Allocated sample buffer for %s at 0x%08X\n", 5643 5646 substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 5644 5647 "playback" : "capture", 5645 5648 snd_pcm_sgbuf_get_addr(substream, 0)); 5646 5649 */ 5647 5650 /* 5648 - snd_printdd("set_hwparams: %s %d Hz, %d channels, bs = %d\n", 5651 + dev_dbg(hdspm->card->dev, 5652 + "set_hwparams: %s %d Hz, %d channels, bs = %d\n", 5649 5653 substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 5650 5654 "playback" : "capture", 5651 5655 params_rate(params), params_channels(params), ··· 5669 5667 /* Switch to native float format if requested */ 5670 5668 if (SNDRV_PCM_FORMAT_FLOAT_LE == params_format(params)) { 5671 5669 if (!(hdspm->control_register & HDSPe_FLOAT_FORMAT)) 5672 - snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE float format.\n"); 5670 + dev_info(hdspm->card->dev, 5671 + "Switching to native 32bit LE float format.\n"); 5673 5672 5674 5673 hdspm->control_register |= HDSPe_FLOAT_FORMAT; 5675 5674 } else if (SNDRV_PCM_FORMAT_S32_LE == params_format(params)) { 5676 5675 if (hdspm->control_register & HDSPe_FLOAT_FORMAT) 5677 - snd_printk(KERN_INFO "hdspm: Switching to native 32bit LE integer format.\n"); 5676 + dev_info(hdspm->card->dev, 5677 + "Switching to native 32bit LE integer format.\n"); 5678 5678 5679 5679 hdspm->control_register &= ~HDSPe_FLOAT_FORMAT; 5680 5680 } ··· 5719 5715 5720 5716 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { 5721 5717 if (snd_BUG_ON(info->channel >= hdspm->max_channels_out)) { 5722 - snd_printk(KERN_INFO "snd_hdspm_channel_info: output channel out of range (%d)\n", info->channel); 5718 + dev_info(hdspm->card->dev, 5719 + "snd_hdspm_channel_info: output channel out of range (%d)\n", 5720 + info->channel); 5723 5721 return -EINVAL; 5724 5722 } 5725 5723 5726 5724 if (hdspm->channel_map_out[info->channel] < 0) { 5727 - snd_printk(KERN_INFO "snd_hdspm_channel_info: output channel %d mapped out\n", info->channel); 5725 + dev_info(hdspm->card->dev, 5726 + "snd_hdspm_channel_info: output channel %d mapped out\n", 5727 + info->channel); 5728 5728 return -EINVAL; 5729 5729 } 5730 5730 ··· 5736 5728 HDSPM_CHANNEL_BUFFER_BYTES; 5737 5729 } else { 5738 5730 if (snd_BUG_ON(info->channel >= hdspm->max_channels_in)) { 5739 - snd_printk(KERN_INFO "snd_hdspm_channel_info: input channel out of range (%d)\n", info->channel); 5731 + dev_info(hdspm->card->dev, 5732 + "snd_hdspm_channel_info: input channel out of range (%d)\n", 5733 + info->channel); 5740 5734 return -EINVAL; 5741 5735 } 5742 5736 5743 5737 if (hdspm->channel_map_in[info->channel] < 0) { 5744 - snd_printk(KERN_INFO "snd_hdspm_channel_info: input channel %d mapped out\n", info->channel); 5738 + dev_info(hdspm->card->dev, 5739 + "snd_hdspm_channel_info: input channel %d mapped out\n", 5740 + info->channel); 5745 5741 return -EINVAL; 5746 5742 } 5747 5743 ··· 6295 6283 6296 6284 s = copy_to_user(argp, levels, sizeof(struct hdspm_peak_rms)); 6297 6285 if (0 != s) { 6298 - /* snd_printk(KERN_ERR "copy_to_user(.., .., %lu): %lu 6286 + /* dev_err(hdspm->card->dev, "copy_to_user(.., .., %lu): %lu 6299 6287 [Levels]\n", sizeof(struct hdspm_peak_rms), s); 6300 6288 */ 6301 6289 return -EFAULT; ··· 6341 6329 s = copy_to_user(argp, &ltc, sizeof(struct hdspm_ltc)); 6342 6330 if (0 != s) { 6343 6331 /* 6344 - snd_printk(KERN_ERR "copy_to_user(.., .., %lu): %lu [LTC]\n", sizeof(struct hdspm_ltc), s); */ 6332 + dev_err(hdspm->card->dev, "copy_to_user(.., .., %lu): %lu [LTC]\n", sizeof(struct hdspm_ltc), s); */ 6345 6333 return -EFAULT; 6346 6334 } 6347 6335 ··· 6506 6494 wanted, 6507 6495 wanted); 6508 6496 if (err < 0) { 6509 - snd_printdd("Could not preallocate %zd Bytes\n", wanted); 6497 + dev_dbg(hdspm->card->dev, 6498 + "Could not preallocate %zd Bytes\n", wanted); 6510 6499 6511 6500 return err; 6512 6501 } else 6513 - snd_printdd(" Preallocated %zd Bytes\n", wanted); 6502 + dev_dbg(hdspm->card->dev, 6503 + " Preallocated %zd Bytes\n", wanted); 6514 6504 6515 6505 return 0; 6516 6506 } ··· 6573 6559 { 6574 6560 int err, i; 6575 6561 6576 - snd_printdd("Create card...\n"); 6562 + dev_dbg(card->dev, "Create card...\n"); 6577 6563 err = snd_hdspm_create_pcm(card, hdspm); 6578 6564 if (err < 0) 6579 6565 return err; ··· 6595 6581 if (err < 0) 6596 6582 return err; 6597 6583 6598 - snd_printdd("proc init...\n"); 6584 + dev_dbg(card->dev, "proc init...\n"); 6599 6585 snd_hdspm_proc_init(hdspm); 6600 6586 6601 6587 hdspm->system_sample_rate = -1; ··· 6606 6592 hdspm->capture_substream = NULL; 6607 6593 hdspm->playback_substream = NULL; 6608 6594 6609 - snd_printdd("Set defaults...\n"); 6595 + dev_dbg(card->dev, "Set defaults...\n"); 6610 6596 err = snd_hdspm_set_defaults(hdspm); 6611 6597 if (err < 0) 6612 6598 return err; 6613 6599 6614 - snd_printdd("Update mixer controls...\n"); 6600 + dev_dbg(card->dev, "Update mixer controls...\n"); 6615 6601 hdspm_update_simple_mixer_controls(hdspm); 6616 6602 6617 - snd_printdd("Initializeing complete ???\n"); 6603 + dev_dbg(card->dev, "Initializeing complete ???\n"); 6618 6604 6619 6605 err = snd_card_register(card); 6620 6606 if (err < 0) { 6621 - snd_printk(KERN_ERR "HDSPM: error registering card\n"); 6607 + dev_err(card->dev, "error registering card\n"); 6622 6608 return err; 6623 6609 } 6624 6610 6625 - snd_printdd("... yes now\n"); 6611 + dev_dbg(card->dev, "... yes now\n"); 6626 6612 6627 6613 return 0; 6628 6614 } ··· 6676 6662 hdspm->card_name = "RME MADI"; 6677 6663 hdspm->midiPorts = 3; 6678 6664 } else { 6679 - snd_printk(KERN_ERR 6680 - "HDSPM: unknown firmware revision %x\n", 6665 + dev_err(card->dev, 6666 + "unknown firmware revision %x\n", 6681 6667 hdspm->firmware_rev); 6682 6668 return -ENODEV; 6683 6669 } ··· 6696 6682 hdspm->port = pci_resource_start(pci, 0); 6697 6683 io_extent = pci_resource_len(pci, 0); 6698 6684 6699 - snd_printdd("grabbed memory region 0x%lx-0x%lx\n", 6685 + dev_dbg(card->dev, "grabbed memory region 0x%lx-0x%lx\n", 6700 6686 hdspm->port, hdspm->port + io_extent - 1); 6701 6687 6702 6688 hdspm->iobase = ioremap_nocache(hdspm->port, io_extent); 6703 6689 if (!hdspm->iobase) { 6704 - snd_printk(KERN_ERR "HDSPM: " 6705 - "unable to remap region 0x%lx-0x%lx\n", 6690 + dev_err(card->dev, "unable to remap region 0x%lx-0x%lx\n", 6706 6691 hdspm->port, hdspm->port + io_extent - 1); 6707 6692 return -EBUSY; 6708 6693 } 6709 - snd_printdd("remapped region (0x%lx) 0x%lx-0x%lx\n", 6694 + dev_dbg(card->dev, "remapped region (0x%lx) 0x%lx-0x%lx\n", 6710 6695 (unsigned long)hdspm->iobase, hdspm->port, 6711 6696 hdspm->port + io_extent - 1); 6712 6697 6713 6698 if (request_irq(pci->irq, snd_hdspm_interrupt, 6714 6699 IRQF_SHARED, KBUILD_MODNAME, hdspm)) { 6715 - snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq); 6700 + dev_err(card->dev, "unable to use IRQ %d\n", pci->irq); 6716 6701 return -EBUSY; 6717 6702 } 6718 6703 6719 - snd_printdd("use IRQ %d\n", pci->irq); 6704 + dev_dbg(card->dev, "use IRQ %d\n", pci->irq); 6720 6705 6721 6706 hdspm->irq = pci->irq; 6722 6707 6723 - snd_printdd("kmalloc Mixer memory of %zd Bytes\n", 6708 + dev_dbg(card->dev, "kmalloc Mixer memory of %zd Bytes\n", 6724 6709 sizeof(struct hdspm_mixer)); 6725 6710 hdspm->mixer = kzalloc(sizeof(struct hdspm_mixer), GFP_KERNEL); 6726 6711 if (!hdspm->mixer) { 6727 - snd_printk(KERN_ERR "HDSPM: " 6728 - "unable to kmalloc Mixer memory of %d Bytes\n", 6712 + dev_err(card->dev, 6713 + "unable to kmalloc Mixer memory of %d Bytes\n", 6729 6714 (int)sizeof(struct hdspm_mixer)); 6730 6715 return -ENOMEM; 6731 6716 } ··· 6793 6780 hdspm->qs_out_channels = AIO_OUT_QS_CHANNELS; 6794 6781 6795 6782 if (0 == (hdspm_read(hdspm, HDSPM_statusRegister2) & HDSPM_s2_AEBI_D)) { 6796 - snd_printk(KERN_INFO "HDSPM: AEB input board found\n"); 6783 + dev_info(card->dev, "AEB input board found\n"); 6797 6784 hdspm->ss_in_channels += 4; 6798 6785 hdspm->ds_in_channels += 4; 6799 6786 hdspm->qs_in_channels += 4; 6800 6787 } 6801 6788 6802 6789 if (0 == (hdspm_read(hdspm, HDSPM_statusRegister2) & HDSPM_s2_AEBO_D)) { 6803 - snd_printk(KERN_INFO "HDSPM: AEB output board found\n"); 6790 + dev_info(card->dev, "AEB output board found\n"); 6804 6791 hdspm->ss_out_channels += 4; 6805 6792 hdspm->ds_out_channels += 4; 6806 6793 hdspm->qs_out_channels += 4; ··· 6867 6854 if (NULL != hdspm->tco) { 6868 6855 hdspm_tco_write(hdspm); 6869 6856 } 6870 - snd_printk(KERN_INFO "HDSPM: AIO/RayDAT TCO module found\n"); 6857 + dev_info(card->dev, "AIO/RayDAT TCO module found\n"); 6871 6858 } else { 6872 6859 hdspm->tco = NULL; 6873 6860 } ··· 6882 6869 if (NULL != hdspm->tco) { 6883 6870 hdspm_tco_write(hdspm); 6884 6871 } 6885 - snd_printk(KERN_INFO "HDSPM: MADI/AES TCO module found\n"); 6872 + dev_info(card->dev, "MADI/AES TCO module found\n"); 6886 6873 } else { 6887 6874 hdspm->tco = NULL; 6888 6875 } ··· 6964 6951 } 6965 6952 } 6966 6953 6967 - snd_printdd("create alsa devices.\n"); 6954 + dev_dbg(card->dev, "create alsa devices.\n"); 6968 6955 err = snd_hdspm_create_alsa_devices(card, hdspm); 6969 6956 if (err < 0) 6970 6957 return err;