ALSA: ctxfi: pr_* replaced with dev_*

[firefly-linux-kernel-4.4.55.git] / sound / pci / ctxfi / cthw20k2.c

diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index b2c5d5a05a956655a8e973c3f55c568b373d2907..253899d1379096ea3108c5588aa012b3e4bd9a80 100644 (file)
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -1187,7 +1187,8 @@ static int hw_daio_init(struct hw *hw, const struct daio_conf *info)
                hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);
                hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);
        } else {
-               pr_alert("ctxfi: ERROR!!! Invalid sampling rate!!!\n");
+               dev_alert(hw->card->dev,
+                         "ERROR!!! Invalid sampling rate!!!\n");
                return -EINVAL;
        }
 
@@ -1246,7 +1247,8 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)
 
        /* Set up device page table */
        if ((~0UL) == info->vm_pgt_phys) {
-               pr_alert("ctxfi: Wrong device page table page address!!!\n");
+               dev_alert(hw->card->dev,
+                         "Wrong device page table page address!!!\n");
                return -1;
        }
 
@@ -1351,7 +1353,8 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)
                break;
        }
        if (i >= 1000) {
-               pr_alert("ctxfi: PLL initialization failed!!!\n");
+               dev_alert(hw->card->dev,
+                         "PLL initialization failed!!!\n");
                return -EBUSY;
        }
 
@@ -1375,7 +1378,7 @@ static int hw_auto_init(struct hw *hw)
                        break;
        }
        if (!get_field(gctl, GCTL_AID)) {
-               pr_alert("ctxfi: Card Auto-init failed!!!\n");
+               dev_alert(hw->card->dev, "Card Auto-init failed!!!\n");
                return -EBUSY;
        }
 
@@ -1846,7 +1849,7 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info)
        /* Initialize I2C */
        err = hw20k2_i2c_init(hw, 0x1A, 1, 1);
        if (err < 0) {
-               pr_alert("ctxfi: Failure to acquire I2C!!!\n");
+               dev_alert(hw->card->dev, "Failure to acquire I2C!!!\n");
                goto error;
        }
 
@@ -1889,8 +1892,9 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info)
                hw20k2_i2c_write(hw, MAKE_WM8775_ADDR(WM8775_MMC, 0x0A),
                                                MAKE_WM8775_DATA(0x0A));
        } else {
-               pr_alert("ctxfi: Invalid master sampling rate (msr %d)!!!\n",
-                       info->msr);
+               dev_alert(hw->card->dev,
+                         "Invalid master sampling rate (msr %d)!!!\n",
+                         info->msr);
                err = -EINVAL;
                goto error;
        }
@@ -2033,7 +2037,8 @@ static int hw_card_start(struct hw *hw)
        /* Set DMA transfer mask */
        if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
            pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
-               pr_err("ctxfi: architecture does not support PCI busmaster DMA with mask 0x%llx\n",
+               dev_err(hw->card->dev,
+                       "architecture does not support PCI busmaster DMA with mask 0x%llx\n",
                        CT_XFI_DMA_MASK);
                err = -ENXIO;
                goto error1;
@@ -2062,7 +2067,8 @@ static int hw_card_start(struct hw *hw)
                err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
                                  KBUILD_MODNAME, hw);
                if (err < 0) {
-                       pr_err("XFi: Cannot get irq %d\n", pci->irq);
+                       dev_err(hw->card->dev,
+                               "XFi: Cannot get irq %d\n", pci->irq);
                        goto error2;
                }
                hw->irq = pci->irq;