Commit def358f9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: trident: Use standard print API 



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: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-43-tiwai@suse.de
parent 1b28f418

sound/pci/trident/trident_memory.c

+5 −5
Original line number Diff line number Diff line
@@ -137,14 +137,14 @@ search_empty(struct snd_util_memhdr *hdr, int size) 
/*

 * 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;