aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ctxfi/cthw20k2.c
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2014-08-26 09:31:42 -0400
committerTakashi Iwai <tiwai@suse.de>2014-08-26 09:40:54 -0400
commite720b82027b99482ea5d1001a69bdf2200e86b79 (patch)
treef5550b5e8ec2309aec6b4ed9ede6fc949b3edfc9 /sound/pci/ctxfi/cthw20k2.c
parent57f2d8b797c4c8d9e65e3b9fae98246be5a93df3 (diff)
ALSA: ctxfi: prink replacement
as pr_* macros are more preffered over printk, so printk replaced with corresponding pr_err and pr_alert this patch will generate a warning from checkpatch for an unnecessary space before new line and has not been fixed as this patch is only for printk replacement. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/cthw20k2.c')
-rw-r--r--sound/pci/ctxfi/cthw20k2.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index b1438861d38a..8a72fac929ca 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -1187,7 +1187,7 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info)
1187 hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121); 1187 hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);
1188 hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0); 1188 hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);
1189 } else { 1189 } else {
1190 printk(KERN_ALERT "ctxfi: ERROR!!! Invalid sampling rate!!!\n"); 1190 pr_alert("ctxfi: ERROR!!! Invalid sampling rate!!!\n");
1191 return -EINVAL; 1191 return -EINVAL;
1192 } 1192 }
1193 1193
@@ -1246,7 +1246,7 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)
1246 1246
1247 /* Set up device page table */ 1247 /* Set up device page table */
1248 if ((~0UL) == info->vm_pgt_phys) { 1248 if ((~0UL) == info->vm_pgt_phys) {
1249 printk(KERN_ALERT "ctxfi: " 1249 pr_alert("ctxfi: "
1250 "Wrong device page table page address!!!\n"); 1250 "Wrong device page table page address!!!\n");
1251 return -1; 1251 return -1;
1252 } 1252 }
@@ -1352,7 +1352,7 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)
1352 break; 1352 break;
1353 } 1353 }
1354 if (i >= 1000) { 1354 if (i >= 1000) {
1355 printk(KERN_ALERT "ctxfi: PLL initialization failed!!!\n"); 1355 pr_alert("ctxfi: PLL initialization failed!!!\n");
1356 return -EBUSY; 1356 return -EBUSY;
1357 } 1357 }
1358 1358
@@ -1376,7 +1376,7 @@ static int hw_auto_init(struct hw *hw)
1376 break; 1376 break;
1377 } 1377 }
1378 if (!get_field(gctl, GCTL_AID)) { 1378 if (!get_field(gctl, GCTL_AID)) {
1379 printk(KERN_ALERT "ctxfi: Card Auto-init failed!!!\n"); 1379 pr_alert("ctxfi: Card Auto-init failed!!!\n");
1380 return -EBUSY; 1380 return -EBUSY;
1381 } 1381 }
1382 1382
@@ -1847,7 +1847,7 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info)
1847 /* Initialize I2C */ 1847 /* Initialize I2C */
1848 err = hw20k2_i2c_init(hw, 0x1A, 1, 1); 1848 err = hw20k2_i2c_init(hw, 0x1A, 1, 1);
1849 if (err < 0) { 1849 if (err < 0) {
1850 printk(KERN_ALERT "ctxfi: Failure to acquire I2C!!!\n"); 1850 pr_alert("ctxfi: Failure to acquire I2C!!!\n");
1851 goto error; 1851 goto error;
1852 } 1852 }
1853 1853
@@ -1890,7 +1890,7 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info)
1890 hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A), 1890 hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A),
1891 MAKE_WM8775_DATA(0x0A)); 1891 MAKE_WM8775_DATA(0x0A));
1892 } else { 1892 } else {
1893 printk(KERN_ALERT "ctxfi: Invalid master sampling " 1893 pr_alert("ctxfi: Invalid master sampling "
1894 "rate (msr %d)!!!\n", info->msr); 1894 "rate (msr %d)!!!\n", info->msr);
1895 err = -EINVAL; 1895 err = -EINVAL;
1896 goto error; 1896 goto error;
@@ -2034,7 +2034,7 @@ static int hw_card_start(struct hw *hw)
2034 /* Set DMA transfer mask */ 2034 /* Set DMA transfer mask */
2035 if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 || 2035 if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
2036 pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) { 2036 pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
2037 printk(KERN_ERR "ctxfi: architecture does not support PCI " 2037 pr_err("ctxfi: architecture does not support PCI "
2038 "busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK); 2038 "busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK);
2039 err = -ENXIO; 2039 err = -ENXIO;
2040 goto error1; 2040 goto error1;
@@ -2063,7 +2063,7 @@ static int hw_card_start(struct hw *hw)
2063 err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED, 2063 err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
2064 KBUILD_MODNAME, hw); 2064 KBUILD_MODNAME, hw);
2065 if (err < 0) { 2065 if (err < 0) {
2066 printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); 2066 pr_err("XFi: Cannot get irq %d\n", pci->irq);
2067 goto error2; 2067 goto error2;
2068 } 2068 }
2069 hw->irq = pci->irq; 2069 hw->irq = pci->irq;