]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ALSA: trident: Use standard print API
authorTakashi Iwai <tiwai@suse.de>
Wed, 7 Aug 2024 13:34:32 +0000 (15:34 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 8 Aug 2024 05:49:46 +0000 (07:49 +0200)
Use the standard print API with dev_*() instead of the old house-baked
one.  It gives better information and allows dynamically control of
debug prints.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-43-tiwai@suse.de
sound/pci/trident/trident_memory.c

index 05de2b9f4ed7c20f40472f84b3c9f5eeb4ffa45e..4a36f194c7f8d9e70c0b6dac52e0a6d4af0e24c1 100644 (file)
@@ -137,14 +137,14 @@ __found_pages:
 /*
  * check if the given pointer is valid for pages
  */
-static int is_valid_page(unsigned long ptr)
+static int is_valid_page(struct snd_trident *trident, unsigned long ptr)
 {
        if (ptr & ~0x3fffffffUL) {
-               snd_printk(KERN_ERR "max memory size is 1GB!!\n");
+               dev_err(trident->card->dev, "max memory size is 1GB!!\n");
                return 0;
        }
        if (ptr & (SNDRV_TRIDENT_PAGE_SIZE-1)) {
-               snd_printk(KERN_ERR "page is not aligned\n");
+               dev_err(trident->card->dev, "page is not aligned\n");
                return 0;
        }
        return 1;
@@ -184,7 +184,7 @@ snd_trident_alloc_sg_pages(struct snd_trident *trident,
        for (page = firstpg(blk); page <= lastpg(blk); page++, idx++) {
                unsigned long ofs = idx << PAGE_SHIFT;
                dma_addr_t addr = snd_pcm_sgbuf_get_addr(substream, ofs);
-               if (! is_valid_page(addr)) {
+               if (!is_valid_page(trident, addr)) {
                        __snd_util_mem_free(hdr, blk);
                        mutex_unlock(&hdr->block_mutex);
                        return NULL;
@@ -227,7 +227,7 @@ snd_trident_alloc_cont_pages(struct snd_trident *trident,
        addr = runtime->dma_addr;
        for (page = firstpg(blk); page <= lastpg(blk); page++,
             addr += SNDRV_TRIDENT_PAGE_SIZE) {
-               if (! is_valid_page(addr)) {
+               if (!is_valid_page(trident, addr)) {
                        __snd_util_mem_free(hdr, blk);
                        mutex_unlock(&hdr->block_mutex);
                        return NULL;