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>

diff --git a/sound/pci/ctxfi/ctamixer.c b/sound/pci/ctxfi/ctamixer.c
index fee35cfc0c7f0c62895aad3b9bb3748ab0df7fa7..fed6e6a57608871d5ddfd9549c3b3013a69e00c8 100644 (file)
--- a/sound/pci/ctxfi/ctamixer.c
+++ b/sound/pci/ctxfi/ctamixer.c
@@ -258,7 +258,7 @@ static int get_amixer_rsc(struct amixer_mgr *mgr,
        }
        spin_unlock_irqrestore(&mgr->mgr_lock, flags);
        if (err) {
-               printk(KERN_ERR "ctxfi: Can't meet AMIXER resource request!\n");
+               pr_err("ctxfi: Can't meet AMIXER resource request!\n");
                goto error;
        }
 
@@ -411,7 +411,7 @@ static int get_sum_rsc(struct sum_mgr *mgr,
        }
        spin_unlock_irqrestore(&mgr->mgr_lock, flags);
        if (err) {
-               printk(KERN_ERR "ctxfi: Can't meet SUM resource request!\n");
+               pr_err("ctxfi: Can't meet SUM resource request!\n");
                goto error;
        }
 

diff --git a/sound/pci/ctxfi/ctatc.c b/sound/pci/ctxfi/ctatc.c
index af632bd08323feaf0f9ab2d3098375e12f38d46b..ce9061aee587abdba697eaa218de6a8970368643 100644 (file)
--- a/sound/pci/ctxfi/ctatc.c
+++ b/sound/pci/ctxfi/ctatc.c
@@ -185,7 +185,7 @@ static unsigned int convert_format(snd_pcm_format_t snd_format)
        case SNDRV_PCM_FORMAT_FLOAT_LE:
                return SRC_SF_F32;
        default:
-               printk(KERN_ERR "ctxfi: not recognized snd format is %d \n",
+               pr_err("ctxfi: not recognized snd format is %d \n",
                        snd_format);
                return SRC_SF_S16;
        }
@@ -1282,7 +1282,7 @@ static int atc_identify_card(struct ct_atc *atc, unsigned int ssid)
        p = snd_pci_quirk_lookup_id(vendor_id, device_id, list);
        if (p) {
                if (p->value < 0) {
-                       printk(KERN_ERR "ctxfi: "
+                       pr_err("ctxfi: "
                               "Device %04x:%04x is black-listed\n",
                               vendor_id, device_id);
                        return -ENOENT;
@@ -1315,7 +1315,7 @@ int ct_atc_create_alsa_devs(struct ct_atc *atc)
                err = alsa_dev_funcs[i].create(atc, i,
                                alsa_dev_funcs[i].public_name);
                if (err) {
-                       printk(KERN_ERR "ctxfi: "
+                       pr_err("ctxfi: "
                               "Creating alsa device %d failed!\n", i);
                        return err;
                }
@@ -1332,7 +1332,7 @@ static int atc_create_hw_devs(struct ct_atc *atc)
 
        err = create_hw_obj(atc->pci, atc->chip_type, atc->model, &hw);
        if (err) {
-               printk(KERN_ERR "Failed to create hw obj!!!\n");
+               pr_err("Failed to create hw obj!!!\n");
                return err;
        }
        atc->hw = hw;
@@ -1351,7 +1351,7 @@ static int atc_create_hw_devs(struct ct_atc *atc)
 
                err = rsc_mgr_funcs[i].create(atc->hw, &atc->rsc_mgrs[i]);
                if (err) {
-                       printk(KERN_ERR "ctxfi: "
+                       pr_err("ctxfi: "
                               "Failed to create rsc_mgr %d!!!\n", i);
                        return err;
                }
@@ -1399,7 +1399,7 @@ static int atc_get_resources(struct ct_atc *atc)
                err = daio_mgr->get_daio(daio_mgr, &da_desc,
                                        (struct daio **)&atc->daios[i]);
                if (err) {
-                       printk(KERN_ERR "ctxfi: Failed to get DAIO "
+                       pr_err("ctxfi: Failed to get DAIO "
                                        "resource %d!!!\n", i);
                        return err;
                }
@@ -1603,7 +1603,7 @@ static int atc_resume(struct ct_atc *atc)
        /* Do hardware resume. */
        err = atc_hw_resume(atc);
        if (err < 0) {
-               printk(KERN_ERR "ctxfi: pci_enable_device failed, "
+               pr_err("ctxfi: pci_enable_device failed, "
                       "disabling device\n");
                snd_card_disconnect(atc->card);
                return err;
@@ -1701,7 +1701,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci,
        /* Find card model */
        err = atc_identify_card(atc, ssid);
        if (err < 0) {
-               printk(KERN_ERR "ctatc: Card not recognised\n");
+               pr_err("ctatc: Card not recognised\n");
                goto error1;
        }
 
@@ -1717,7 +1717,7 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci,
 
        err = ct_mixer_create(atc, (struct ct_mixer **)&atc->mixer);
        if (err) {
-               printk(KERN_ERR "ctxfi: Failed to create mixer obj!!!\n");
+               pr_err("ctxfi: Failed to create mixer obj!!!\n");
                goto error1;
        }
 
@@ -1744,6 +1744,6 @@ int ct_atc_create(struct snd_card *card, struct pci_dev *pci,
 
 error1:
        ct_atc_destroy(atc);
-       printk(KERN_ERR "ctxfi: Something wrong!!!\n");
+       pr_err("ctxfi: Something wrong!!!\n");
        return err;
 }

diff --git a/sound/pci/ctxfi/ctdaio.c b/sound/pci/ctxfi/ctdaio.c
index 84f86bf63b8fc31dc27700013608a65a7af970bb..6f0654ea363026b2b86857cf84ab9a49f2c48235 100644 (file)
--- a/sound/pci/ctxfi/ctdaio.c
+++ b/sound/pci/ctxfi/ctdaio.c
@@ -541,7 +541,7 @@ static int get_daio_rsc(struct daio_mgr *mgr,
        err = daio_mgr_get_rsc(&mgr->mgr, desc->type);
        spin_unlock_irqrestore(&mgr->mgr_lock, flags);
        if (err) {
-               printk(KERN_ERR "Can't meet DAIO resource request!\n");
+               pr_err("Can't meet DAIO resource request!\n");
                return err;
        }
 

diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 6ac40beb49dabea2b54e3de48a9eb721cfc3a5ae..782641e77653682aaeca7176ef0fed3c6fc71a51 100644 (file)
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1268,7 +1268,7 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)
 
        /* Set up device page table */
        if ((~0UL) == info->vm_pgt_phys) {
-               printk(KERN_ERR "Wrong device page table page address!\n");
+               pr_err("Wrong device page table page address!\n");
                return -1;
        }
 
@@ -1327,7 +1327,7 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)
                mdelay(40);
        }
        if (i >= 3) {
-               printk(KERN_ALERT "PLL initialization failed!!!\n");
+               pr_alert("PLL initialization failed!!!\n");
                return -EBUSY;
        }
 
@@ -1351,7 +1351,7 @@ static int hw_auto_init(struct hw *hw)
                        break;
        }
        if (!get_field(gctl, GCTL_AID)) {
-               printk(KERN_ALERT "Card Auto-init failed!!!\n");
+               pr_alert("Card Auto-init failed!!!\n");
                return -EBUSY;
        }
 
@@ -1911,7 +1911,7 @@ 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) {
-               printk(KERN_ERR "architecture does not support PCI "
+               pr_err("architecture does not support PCI "
                                "busmaster DMA with mask 0x%llx\n",
                       CT_XFI_DMA_MASK);
                err = -ENXIO;
@@ -1942,7 +1942,7 @@ static int hw_card_start(struct hw *hw)
                err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED,
                                  KBUILD_MODNAME, hw);
                if (err < 0) {
-                       printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
+                       pr_err("XFi: Cannot get irq %d\n", pci->irq);
                        goto error2;
                }
                hw->irq = pci->irq;

diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index b1438861d38ade68112572dbec342240a24d9e34..8a72fac929ca97b3efa399ca8c29711bbb83b252 100644 (file)
--- 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)
                hw_write_20kx(hw, AUDIO_IO_TX_BLRCLK, 0x21212121);
                hw_write_20kx(hw, AUDIO_IO_RX_BLRCLK, 0);
        } else {
-               printk(KERN_ALERT "ctxfi: ERROR!!! Invalid sampling rate!!!\n");
+               pr_alert("ctxfi: ERROR!!! Invalid sampling rate!!!\n");
                return -EINVAL;
        }
 
@@ -1246,7 +1246,7 @@ static int hw_trn_init(struct hw *hw, const struct trn_conf *info)
 
        /* Set up device page table */
        if ((~0UL) == info->vm_pgt_phys) {
-               printk(KERN_ALERT "ctxfi: "
+               pr_alert("ctxfi: "
                       "Wrong device page table page address!!!\n");
                return -1;
        }
@@ -1352,7 +1352,7 @@ static int hw_pll_init(struct hw *hw, unsigned int rsr)
                break;
        }
        if (i >= 1000) {
-               printk(KERN_ALERT "ctxfi: PLL initialization failed!!!\n");
+               pr_alert("ctxfi: PLL initialization failed!!!\n");
                return -EBUSY;
        }
 
@@ -1376,7 +1376,7 @@ static int hw_auto_init(struct hw *hw)
                        break;
        }
        if (!get_field(gctl, GCTL_AID)) {
-               printk(KERN_ALERT "ctxfi: Card Auto-init failed!!!\n");
+               pr_alert("ctxfi: Card Auto-init failed!!!\n");
                return -EBUSY;
        }
 
@@ -1847,7 +1847,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) {
-               printk(KERN_ALERT "ctxfi: Failure to acquire I2C!!!\n");
+               pr_alert("ctxfi: Failure to acquire I2C!!!\n");
                goto error;
        }
 
@@ -1890,7 +1890,7 @@ 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 {
-               printk(KERN_ALERT "ctxfi: Invalid master sampling "
+               pr_alert("ctxfi: Invalid master sampling "
                                  "rate (msr %d)!!!\n", info->msr);
                err = -EINVAL;
                goto error;
@@ -2034,7 +2034,7 @@ 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) {
-               printk(KERN_ERR "ctxfi: architecture does not support PCI "
+               pr_err("ctxfi: architecture does not support PCI "
                "busmaster DMA with mask 0x%llx\n", CT_XFI_DMA_MASK);
                err = -ENXIO;
                goto error1;
@@ -2063,7 +2063,7 @@ static int hw_card_start(struct hw *hw)
                err = request_irq(pci->irq, ct_20k2_interrupt, IRQF_SHARED,
                                  KBUILD_MODNAME, hw);
                if (err < 0) {
-                       printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq);
+                       pr_err("XFi: Cannot get irq %d\n", pci->irq);
                        goto error2;
                }
                hw->irq = pci->irq;

diff --git a/sound/pci/ctxfi/ctmixer.c b/sound/pci/ctxfi/ctmixer.c
index 48fe0e39c2be273a95762698999dd4cf5508b019..8d986e45ecf6c9e473e0f63297ad5677251866b3 100644 (file)
--- a/sound/pci/ctxfi/ctmixer.c
+++ b/sound/pci/ctxfi/ctmixer.c
@@ -854,7 +854,7 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer)
        for (i = 0; i < (NUM_CT_SUMS * CHN_NUM); i++) {
                err = sum_mgr->get_sum(sum_mgr, &sum_desc, &sum);
                if (err) {
-                       printk(KERN_ERR "ctxfi:Failed to get sum resources for "
+                       pr_err("ctxfi:Failed to get sum resources for "
                                          "front output!\n");
                        break;
                }
@@ -869,7 +869,7 @@ static int ct_mixer_get_resources(struct ct_mixer *mixer)
        for (i = 0; i < (NUM_CT_AMIXERS * CHN_NUM); i++) {
                err = amixer_mgr->get_amixer(amixer_mgr, &am_desc, &amixer);
                if (err) {
-                       printk(KERN_ERR "ctxfi:Failed to get amixer resources "
+                       pr_err("ctxfi:Failed to get amixer resources "
                               "for mixer obj!\n");
                        break;
                }

diff --git a/sound/pci/ctxfi/ctresource.c b/sound/pci/ctxfi/ctresource.c
index 7dfaf67344d4a0ded780ff575922250fe8df6950..11ac934dcefd191bebab449371a03b35e53061c0 100644 (file)
--- a/sound/pci/ctxfi/ctresource.c
+++ b/sound/pci/ctxfi/ctresource.c
@@ -162,13 +162,13 @@ int rsc_init(struct rsc *rsc, u32 idx, enum RSCTYP type, u32 msr, void *hw)
        case DAIO:
                break;
        default:
-               printk(KERN_ERR
+               pr_err(
                       "ctxfi: Invalid resource type value %d!\n", type);
                return -EINVAL;
        }
 
        if (err) {
-               printk(KERN_ERR
+               pr_err(
                       "ctxfi: Failed to get resource control block!\n");
                return err;
        }
@@ -192,7 +192,7 @@ int rsc_uninit(struct rsc *rsc)
                case DAIO:
                        break;
                default:
-                       printk(KERN_ERR "ctxfi: "
+                       pr_err("ctxfi: "
                               "Invalid resource type value %d!\n", rsc->type);
                        break;
                }
@@ -235,14 +235,14 @@ int rsc_mgr_init(struct rsc_mgr *mgr, enum RSCTYP type,
        case SUM:
                break;
        default:
-               printk(KERN_ERR
+               pr_err(
                       "ctxfi: Invalid resource type value %d!\n", type);
                err = -EINVAL;
                goto error;
        }
 
        if (err) {
-               printk(KERN_ERR
+               pr_err(
                       "ctxfi: Failed to get manager control block!\n");
                goto error;
        }
@@ -286,7 +286,7 @@ int rsc_mgr_uninit(struct rsc_mgr *mgr)
                case SUM:
                        break;
                default:
-                       printk(KERN_ERR "ctxfi: "
+                       pr_err("ctxfi: "
                               "Invalid resource type value %d!\n", mgr->type);
                        break;
                }

diff --git a/sound/pci/ctxfi/ctsrc.c b/sound/pci/ctxfi/ctsrc.c
index 6e77e86307c2c90fd8ca8d3dde53dceebd0499af..19df9b4ed800c5c83b443911345a21ceac857ec6 100644 (file)
--- a/sound/pci/ctxfi/ctsrc.c
+++ b/sound/pci/ctxfi/ctsrc.c
@@ -431,7 +431,7 @@ get_src_rsc(struct src_mgr *mgr, const struct src_desc *desc, struct src **rsrc)
 
        spin_unlock_irqrestore(&mgr->mgr_lock, flags);
        if (err) {
-               printk(KERN_ERR "ctxfi: Can't meet SRC resource request!\n");
+               pr_err("ctxfi: Can't meet SRC resource request!\n");
                return err;
        }
 
@@ -739,7 +739,7 @@ static int get_srcimp_rsc(struct srcimp_mgr *mgr,
        }
        spin_unlock_irqrestore(&mgr->mgr_lock, flags);
        if (err) {
-               printk(KERN_ERR "ctxfi: Can't meet SRCIMP resource request!\n");
+               pr_err("ctxfi: Can't meet SRCIMP resource request!\n");
                goto error1;
        }
 

diff --git a/sound/pci/ctxfi/ctvmem.c b/sound/pci/ctxfi/ctvmem.c
index 6109490b83e83294373f36956a5a8a01dd923e20..5ea015bec793caa86c8d8b91e8a6e1eeea680144 100644 (file)
--- a/sound/pci/ctxfi/ctvmem.c
+++ b/sound/pci/ctxfi/ctvmem.c
@@ -36,7 +36,7 @@ get_vm_block(struct ct_vm *vm, unsigned int size)
 
        size = CT_PAGE_ALIGN(size);
        if (size > vm->size) {
-               printk(KERN_ERR "ctxfi: Fail! No sufficient device virtual "
+               pr_err("ctxfi: Fail! No sufficient device virtual "
                                  "memory space available!\n");
                return NULL;
        }
@@ -132,7 +132,7 @@ ct_vm_map(struct ct_vm *vm, struct snd_pcm_substream *substream, int size)
 
        block = get_vm_block(vm, size);
        if (block == NULL) {
-               printk(KERN_ERR "ctxfi: No virtual memory block that is big "
+               pr_err("ctxfi: No virtual memory block that is big "
                                  "enough to allocate!\n");
                return NULL;
        }

diff --git a/sound/pci/ctxfi/xfi.c b/sound/pci/ctxfi/xfi.c
index 8f8b566a1b35ea0c8d32755b0d6240d351787922..af8c49836000f1820c3c4752486f74a7866a9760 100644 (file)
--- a/sound/pci/ctxfi/xfi.c
+++ b/sound/pci/ctxfi/xfi.c
@@ -76,16 +76,16 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
        if (err)
                return err;
        if ((reference_rate != 48000) && (reference_rate != 44100)) {
-               printk(KERN_ERR "ctxfi: Invalid reference_rate value %u!!!\n",
+               pr_err("ctxfi: Invalid reference_rate value %u!!!\n",
                       reference_rate);
-               printk(KERN_ERR "ctxfi: The valid values for reference_rate "
+               pr_err("ctxfi: The valid values for reference_rate "
                       "are 48000 and 44100, Value 48000 is assumed.\n");
                reference_rate = 48000;
        }
        if ((multiple != 1) && (multiple != 2) && (multiple != 4)) {
-               printk(KERN_ERR "ctxfi: Invalid multiple value %u!!!\n",
+               pr_err("ctxfi: Invalid multiple value %u!!!\n",
                       multiple);
-               printk(KERN_ERR "ctxfi: The valid values for multiple are "
+               pr_err("ctxfi: The valid values for multiple are "
                       "1, 2 and 4, Value 2 is assumed.\n");
                multiple = 2;
        }