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: vx222: Use standard printk helpers

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

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

Takashi Iwai 4c826c49 80c19b75

+13 -13
+3 -4
sound/pci/vx222/vx222.c
··· 170 170 171 171 if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED, 172 172 KBUILD_MODNAME, chip)) { 173 - snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 173 + dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); 174 174 snd_vx222_free(chip); 175 175 return -EBUSY; 176 176 } ··· 228 228 229 229 sprintf(card->longname, "%s at 0x%lx & 0x%lx, irq %i", 230 230 card->shortname, vx->port[0], vx->port[1], vx->core.irq); 231 - snd_printdd("%s at 0x%lx & 0x%lx, irq %i\n", 231 + dev_dbg(card->dev, "%s at 0x%lx & 0x%lx, irq %i\n", 232 232 card->shortname, vx->port[0], vx->port[1], vx->core.irq); 233 233 234 234 #ifdef SND_VX_FW_LOADER ··· 279 279 pci_set_power_state(pci, PCI_D0); 280 280 pci_restore_state(pci); 281 281 if (pci_enable_device(pci) < 0) { 282 - printk(KERN_ERR "vx222: pci_enable_device failed, " 283 - "disabling device\n"); 282 + dev_err(dev, "pci_enable_device failed, disabling device\n"); 284 283 snd_card_disconnect(card); 285 284 return -EIO; 286 285 }
+10 -9
sound/pci/vx222/vx222_ops.c
··· 108 108 { 109 109 outb(val, vx2_reg_addr(chip, offset)); 110 110 /* 111 - printk(KERN_DEBUG "outb: %x -> %x\n", val, vx2_reg_addr(chip, offset)); 111 + dev_dbg(chip->card->dev, "outb: %x -> %x\n", val, vx2_reg_addr(chip, offset)); 112 112 */ 113 113 } 114 114 ··· 129 129 static void vx2_outl(struct vx_core *chip, int offset, unsigned int val) 130 130 { 131 131 /* 132 - printk(KERN_DEBUG "outl: %x -> %x\n", val, vx2_reg_addr(chip, offset)); 132 + dev_dbg(chip->card->dev, "outl: %x -> %x\n", val, vx2_reg_addr(chip, offset)); 133 133 */ 134 134 outl(val, vx2_reg_addr(chip, offset)); 135 135 } ··· 173 173 struct snd_vx222 *chip = (struct snd_vx222 *)_chip; 174 174 unsigned int data; 175 175 176 - snd_printdd("testing xilinx...\n"); 176 + dev_dbg(_chip->card->dev, "testing xilinx...\n"); 177 177 /* This test uses several write/read sequences on TEST0 and TEST1 bits 178 178 * to figure out whever or not the xilinx was correctly loaded 179 179 */ ··· 183 183 vx_inl(chip, ISR); 184 184 data = vx_inl(chip, STATUS); 185 185 if ((data & VX_STATUS_VAL_TEST0_MASK) == VX_STATUS_VAL_TEST0_MASK) { 186 - snd_printdd("bad!\n"); 186 + dev_dbg(_chip->card->dev, "bad!\n"); 187 187 return -ENODEV; 188 188 } 189 189 ··· 192 192 vx_inl(chip, ISR); 193 193 data = vx_inl(chip, STATUS); 194 194 if (! (data & VX_STATUS_VAL_TEST0_MASK)) { 195 - snd_printdd("bad! #2\n"); 195 + dev_dbg(_chip->card->dev, "bad! #2\n"); 196 196 return -ENODEV; 197 197 } 198 198 ··· 203 203 vx_inl(chip, ISR); 204 204 data = vx_inl(chip, STATUS); 205 205 if ((data & VX_STATUS_VAL_TEST1_MASK) == VX_STATUS_VAL_TEST1_MASK) { 206 - snd_printdd("bad! #3\n"); 206 + dev_dbg(_chip->card->dev, "bad! #3\n"); 207 207 return -ENODEV; 208 208 } 209 209 ··· 212 212 vx_inl(chip, ISR); 213 213 data = vx_inl(chip, STATUS); 214 214 if (! (data & VX_STATUS_VAL_TEST1_MASK)) { 215 - snd_printdd("bad! #4\n"); 215 + dev_dbg(_chip->card->dev, "bad! #4\n"); 216 216 return -ENODEV; 217 217 } 218 218 } 219 - snd_printdd("ok, xilinx fine.\n"); 219 + dev_dbg(_chip->card->dev, "ok, xilinx fine.\n"); 220 220 return 0; 221 221 } 222 222 ··· 397 397 i = vx_inl(chip, GPIOC); 398 398 if (i & 0x0100) 399 399 return 0; 400 - snd_printk(KERN_ERR "vx222: xilinx test failed after load, GPIOC=0x%x\n", i); 400 + dev_err(chip->card->dev, 401 + "xilinx test failed after load, GPIOC=0x%x\n", i); 401 402 return -EINVAL; 402 403 } 403 404