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

ALSA: vx_core: 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.

The commented old debug prints are dropped, too.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-12-tiwai@suse.de

Takashi Iwai 41abc805 b426b3ba

+44 -48
+27 -37
sound/drivers/vx/vx_core.c
··· 52 52 return 0; 53 53 //msleep(10); 54 54 } while (time_after_eq(end_time, jiffies)); 55 - snd_printd(KERN_DEBUG "vx_check_reg_bit: timeout, reg=%s, mask=0x%x, val=0x%x\n", reg_names[reg], mask, snd_vx_inb(chip, reg)); 55 + dev_dbg(chip->card->dev, 56 + "vx_check_reg_bit: timeout, reg=%s, mask=0x%x, val=0x%x\n", 57 + reg_names[reg], mask, snd_vx_inb(chip, reg)); 56 58 return -EIO; 57 59 } 58 60 ··· 131 129 if (err & ISR_ERR) { 132 130 err = vx_wait_for_rx_full(chip); 133 131 if (err < 0) { 134 - snd_printd(KERN_DEBUG "transfer_end: error in rx_full\n"); 132 + dev_dbg(chip->card->dev, 133 + "transfer_end: error in rx_full\n"); 135 134 return err; 136 135 } 137 136 err = vx_inb(chip, RXH) << 16; 138 137 err |= vx_inb(chip, RXM) << 8; 139 138 err |= vx_inb(chip, RXL); 140 - snd_printd(KERN_DEBUG "transfer_end: error = 0x%x\n", err); 139 + dev_dbg(chip->card->dev, "transfer_end: error = 0x%x\n", err); 141 140 return -(VX_ERR_MASK | err); 142 141 } 143 142 return 0; ··· 242 239 243 240 err = vx_reset_chk(chip); 244 241 if (err < 0) { 245 - snd_printd(KERN_DEBUG "vx_send_msg: vx_reset_chk error\n"); 242 + dev_dbg(chip->card->dev, "vx_send_msg: vx_reset_chk error\n"); 246 243 return err; 247 244 } 248 245 249 - #if 0 250 - printk(KERN_DEBUG "rmh: cmd = 0x%06x, length = %d, stype = %d\n", 251 - rmh->Cmd[0], rmh->LgCmd, rmh->DspStat); 252 - if (rmh->LgCmd > 1) { 253 - printk(KERN_DEBUG " "); 254 - for (i = 1; i < rmh->LgCmd; i++) 255 - printk(KERN_CONT "0x%06x ", rmh->Cmd[i]); 256 - printk(KERN_CONT "\n"); 257 - } 258 - #endif 259 246 /* Check bit M is set according to length of the command */ 260 247 if (rmh->LgCmd > 1) 261 248 rmh->Cmd[0] |= MASK_MORE_THAN_1_WORD_COMMAND; ··· 255 262 /* Wait for TX empty */ 256 263 err = vx_wait_isr_bit(chip, ISR_TX_EMPTY); 257 264 if (err < 0) { 258 - snd_printd(KERN_DEBUG "vx_send_msg: wait tx empty error\n"); 265 + dev_dbg(chip->card->dev, "vx_send_msg: wait tx empty error\n"); 259 266 return err; 260 267 } 261 268 ··· 267 274 /* Trigger irq MESSAGE */ 268 275 err = vx_send_irq_dsp(chip, IRQ_MESSAGE); 269 276 if (err < 0) { 270 - snd_printd(KERN_DEBUG "vx_send_msg: send IRQ_MESSAGE error\n"); 277 + dev_dbg(chip->card->dev, 278 + "vx_send_msg: send IRQ_MESSAGE error\n"); 271 279 return err; 272 280 } 273 281 ··· 281 287 if (vx_inb(chip, ISR) & ISR_ERR) { 282 288 err = vx_wait_for_rx_full(chip); 283 289 if (err < 0) { 284 - snd_printd(KERN_DEBUG "vx_send_msg: rx_full read error\n"); 290 + dev_dbg(chip->card->dev, 291 + "vx_send_msg: rx_full read error\n"); 285 292 return err; 286 293 } 287 294 err = vx_inb(chip, RXH) << 16; 288 295 err |= vx_inb(chip, RXM) << 8; 289 296 err |= vx_inb(chip, RXL); 290 - snd_printd(KERN_DEBUG "msg got error = 0x%x at cmd[0]\n", err); 297 + dev_dbg(chip->card->dev, 298 + "msg got error = 0x%x at cmd[0]\n", err); 291 299 err = -(VX_ERR_MASK | err); 292 300 return err; 293 301 } ··· 300 304 /* Wait for TX ready */ 301 305 err = vx_wait_isr_bit(chip, ISR_TX_READY); 302 306 if (err < 0) { 303 - snd_printd(KERN_DEBUG "vx_send_msg: tx_ready error\n"); 307 + dev_dbg(chip->card->dev, 308 + "vx_send_msg: tx_ready error\n"); 304 309 return err; 305 310 } 306 311 ··· 313 316 /* Trigger irq MESS_READ_NEXT */ 314 317 err = vx_send_irq_dsp(chip, IRQ_MESS_READ_NEXT); 315 318 if (err < 0) { 316 - snd_printd(KERN_DEBUG "vx_send_msg: IRQ_READ_NEXT error\n"); 319 + dev_dbg(chip->card->dev, 320 + "vx_send_msg: IRQ_READ_NEXT error\n"); 317 321 return err; 318 322 } 319 323 } 320 324 /* Wait for TX empty */ 321 325 err = vx_wait_isr_bit(chip, ISR_TX_READY); 322 326 if (err < 0) { 323 - snd_printd(KERN_DEBUG "vx_send_msg: TX_READY error\n"); 327 + dev_dbg(chip->card->dev, 328 + "vx_send_msg: TX_READY error\n"); 324 329 return err; 325 330 } 326 331 /* End of transfer */ ··· 371 372 if (chip->chip_status & VX_STAT_IS_STALE) 372 373 return -EBUSY; 373 374 374 - #if 0 375 - printk(KERN_DEBUG "send_rih: cmd = 0x%x\n", cmd); 376 - #endif 377 375 err = vx_reset_chk(chip); 378 376 if (err < 0) 379 377 return err; ··· 449 453 if (no_fillup) 450 454 break; 451 455 if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) { 452 - snd_printk(KERN_ERR "dsp boot failed at %d\n", i); 456 + dev_err(chip->card->dev, "dsp boot failed at %d\n", i); 453 457 return -EIO; 454 458 } 455 459 vx_outb(chip, TXH, 0); ··· 458 462 } else { 459 463 const unsigned char *image = boot->data + i; 460 464 if (vx_wait_isr_bit(chip, ISR_TX_EMPTY) < 0) { 461 - snd_printk(KERN_ERR "dsp boot failed at %d\n", i); 465 + dev_err(chip->card->dev, "dsp boot failed at %d\n", i); 462 466 return -EIO; 463 467 } 464 468 vx_outb(chip, TXH, image[0]); ··· 506 510 if (vx_test_irq_src(chip, &events) < 0) 507 511 return IRQ_HANDLED; 508 512 509 - #if 0 510 - if (events & 0x000800) 511 - printk(KERN_ERR "DSP Stream underrun ! IRQ events = 0x%x\n", events); 512 - #endif 513 - // printk(KERN_DEBUG "IRQ events = 0x%x\n", events); 514 - 515 513 /* We must prevent any application using this DSP 516 514 * and block any further request until the application 517 515 * either unregisters or reloads the DSP 518 516 */ 519 517 if (events & FATAL_DSP_ERROR) { 520 - snd_printk(KERN_ERR "vx_core: fatal DSP error!!\n"); 518 + dev_err(chip->card->dev, "vx_core: fatal DSP error!!\n"); 521 519 return IRQ_HANDLED; 522 520 } 523 521 ··· 688 698 /* Wait DSP ready for a new read */ 689 699 err = vx_wait_isr_bit(chip, ISR_TX_EMPTY); 690 700 if (err < 0) { 691 - printk(KERN_ERR 692 - "dsp loading error at position %d\n", i); 701 + dev_err(chip->card->dev, 702 + "dsp loading error at position %d\n", i); 693 703 return err; 694 704 } 695 705 cptr = image; ··· 703 713 csum = (csum >> 24) | (csum << 8); 704 714 vx_outb(chip, TXL, *cptr++); 705 715 } 706 - snd_printdd(KERN_DEBUG "checksum = 0x%08x\n", csum); 707 716 708 717 msleep(200); 709 718 ··· 748 759 continue; 749 760 err = chip->ops->load_dsp(chip, i, chip->firmware[i]); 750 761 if (err < 0) { 751 - snd_printk(KERN_ERR "vx: firmware resume error at DSP %d\n", i); 762 + dev_err(chip->card->dev, 763 + "vx: firmware resume error at DSP %d\n", i); 752 764 return -EIO; 753 765 } 754 766 }
+1 -1
sound/drivers/vx/vx_hwdep.c
··· 59 59 continue; 60 60 sprintf(path, "vx/%s", fw_files[chip->type][i]); 61 61 if (request_firmware(&fw, path, chip->card->dev)) { 62 - snd_printk(KERN_ERR "vx: can't load firmware %s\n", path); 62 + dev_err(chip->card->dev, "vx: can't load firmware %s\n", path); 63 63 return -ENOENT; 64 64 } 65 65 err = chip->ops->load_dsp(chip, i, fw);
+14 -9
sound/drivers/vx/vx_pcm.c
··· 190 190 info->max_size = rmh.Stat[1]; 191 191 info->min_size = rmh.Stat[2]; 192 192 info->granularity = rmh.Stat[3]; 193 - snd_printdd(KERN_DEBUG "vx_set_ibl: size = %d, max = %d, min = %d, gran = %d\n", 194 - info->size, info->max_size, info->min_size, info->granularity); 193 + dev_dbg(chip->card->dev, 194 + "%s: size = %d, max = %d, min = %d, gran = %d\n", 195 + __func__, info->size, info->max_size, info->min_size, 196 + info->granularity); 195 197 return 0; 196 198 } 197 199 ··· 618 616 if (space < 0) { 619 617 /* disconnect the host, SIZE_HBUF command always switches to the stream mode */ 620 618 vx_send_rih(chip, IRQ_CONNECT_STREAM_NEXT); 621 - snd_printd("error hbuffer\n"); 619 + dev_dbg(chip->card->dev, "error hbuffer\n"); 622 620 return space; 623 621 } 624 622 if (space < size) { 625 623 vx_send_rih(chip, IRQ_CONNECT_STREAM_NEXT); 626 - snd_printd("no enough hbuffer space %d\n", space); 624 + dev_dbg(chip->card->dev, "no enough hbuffer space %d\n", space); 627 625 return -EIO; /* XRUN */ 628 626 } 629 627 ··· 797 795 /* IEC958 status (raw-mode) was changed */ 798 796 /* we reopen the pipe */ 799 797 struct vx_rmh rmh; 800 - snd_printdd(KERN_DEBUG "reopen the pipe with data_mode = %d\n", data_mode); 798 + dev_dbg(chip->card->dev, 799 + "reopen the pipe with data_mode = %d\n", data_mode); 801 800 vx_init_rmh(&rmh, CMD_FREE_PIPE); 802 801 vx_set_pipe_cmd_params(&rmh, 0, pipe->number, 0); 803 802 err = vx_send_msg(chip, &rmh); ··· 815 812 } 816 813 817 814 if (chip->pcm_running && chip->freq != runtime->rate) { 818 - snd_printk(KERN_ERR "vx: cannot set different clock %d " 819 - "from the current %d\n", runtime->rate, chip->freq); 815 + dev_err(chip->card->dev, 816 + "vx: cannot set different clock %d from the current %d\n", 817 + runtime->rate, chip->freq); 820 818 return -EINVAL; 821 819 } 822 820 vx_set_clock(chip, runtime->rate); ··· 1095 1091 chip->irq_rmh.Cmd[0] |= 0x00000002; /* SEL_END_OF_BUF_EVENTS */ 1096 1092 1097 1093 if (vx_send_msg(chip, &chip->irq_rmh) < 0) { 1098 - snd_printdd(KERN_ERR "msg send error!!\n"); 1094 + dev_dbg(chip->card->dev, "msg send error!!\n"); 1099 1095 return; 1100 1096 } 1101 1097 ··· 1145 1141 1146 1142 vx_init_rmh(&rmh, CMD_SUPPORTED); 1147 1143 if (vx_send_msg(chip, &rmh) < 0) { 1148 - snd_printk(KERN_ERR "vx: cannot get the supported audio data\n"); 1144 + dev_err(chip->card->dev, 1145 + "vx: cannot get the supported audio data\n"); 1149 1146 return -ENXIO; 1150 1147 } 1151 1148
+2 -1
sound/drivers/vx/vx_uer.c
··· 196 196 197 197 /* Get real clock value */ 198 198 clock = vx_calc_clock_from_freq(chip, freq); 199 - snd_printdd(KERN_DEBUG "set internal clock to 0x%x from freq %d\n", clock, freq); 199 + dev_dbg(chip->card->dev, 200 + "set internal clock to 0x%x from freq %d\n", clock, freq); 200 201 mutex_lock(&chip->lock); 201 202 if (vx_is_pcmcia(chip)) { 202 203 vx_outb(chip, HIFREQ, (clock >> 8) & 0x0f);