ALSA: emu10k1: Use standard printk helpers

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

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

1 files changed, 45 insertions, 28 deletions

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 75504da63613..229269788023 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -217,7 +217,7 @@ static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
         }
         if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
                 /* Hacks for Alice3 to work independent of haP16V driver */
-                snd_printk(KERN_INFO "Audigy2 value: Special config.\n");
+                dev_info(emu->card->dev, "Audigy2 value: Special config.\n");
                 /* Setup SRCMulti_I2S SamplingRate */
                 tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
                 tmp &= 0xfffff1ff;
@@ -723,7 +723,8 @@ static int emu1010_firmware_thread(void *data)
                 if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {
                         /* Audio Dock attached */
                         /* Return to Audio Dock programming mode */
-                        snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");
+                        dev_info(emu->card->dev,
+                                 "emu1010: Loading Audio Dock Firmware\n");
                         snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK);
 
                         if (!emu->dock_fw) {
@@ -756,19 +757,25 @@ static int emu1010_firmware_thread(void *data)
 
                         snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);
                         snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg);
-                        snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n", reg);
+                        dev_info(emu->card->dev,
+                                 "emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n",
+                                 reg);
                         /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
                         snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
-                        snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", reg);
+                        dev_info(emu->card->dev,
+                                 "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", reg);
                         if ((reg & 0x1f) != 0x15) {
                                 /* FPGA failed to be programmed */
-                                snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n", reg);
+                                dev_info(emu->card->dev,
+                                         "emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n",
+                                         reg);
                                 continue;
                         }
-                        snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
+                        dev_info(emu->card->dev,
+                                 "emu1010: Audio Dock Firmware loaded\n");
                         snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
                         snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
-                        snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
+                        dev_info(emu->card->dev, "Audio Dock ver: %u.%u\n",
                                    tmp, tmp2);
                         /* Sync clocking between 1010 and Dock */
                         /* Allow DLL to settle */
@@ -777,7 +784,7 @@ static int emu1010_firmware_thread(void *data)
                         snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
                 }
         }
-        snd_printk(KERN_INFO "emu1010: firmware thread stopping\n");
+        dev_info(emu->card->dev, "emu1010: firmware thread stopping\n");
         return 0;
 }
 
@@ -818,7 +825,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
         u32 tmp, tmp2, reg;
         int err;
 
-        snd_printk(KERN_INFO "emu1010: Special config.\n");
+        dev_info(emu->card->dev, "emu1010: Special config.\n");
         /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
          * Lock Sound Memory Cache, Lock Tank Memory Cache,
          * Mute all codecs.
@@ -843,7 +850,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
 
         /* ID, should read & 0x7f = 0x55. (Bit 7 is the IRQ bit) */
         snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
-        snd_printdd("reg1 = 0x%x\n", reg);
+        dev_dbg(emu->card->dev, "reg1 = 0x%x\n", reg);
         if ((reg & 0x3f) == 0x15) {
                 /* FPGA netlist already present so clear it */
                 /* Return to programming mode */
@@ -851,13 +858,14 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
                 snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0x02);
         }
         snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
-        snd_printdd("reg2 = 0x%x\n", reg);
+        dev_dbg(emu->card->dev, "reg2 = 0x%x\n", reg);
         if ((reg & 0x3f) == 0x15) {
                 /* FPGA failed to return to programming mode */
-                snd_printk(KERN_INFO "emu1010: FPGA failed to return to programming mode\n");
+                dev_info(emu->card->dev,
+                         "emu1010: FPGA failed to return to programming mode\n");
                 return -ENODEV;
         }
-        snd_printk(KERN_INFO "emu1010: EMU_HANA_ID = 0x%x\n", reg);
+        dev_info(emu->card->dev, "emu1010: EMU_HANA_ID = 0x%x\n", reg);
 
         if (!emu->firmware) {
                 const char *filename;
@@ -880,16 +888,19 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
 
                 err = request_firmware(&emu->firmware, filename, &emu->pci->dev);
                 if (err != 0) {
-                        snd_printk(KERN_ERR "emu1010: firmware: %s not found. Err = %d\n", filename, err);
+                        dev_info(emu->card->dev,
+                                 "emu1010: firmware: %s not found. Err = %d\n",
+                                 filename, err);
                         return err;
                 }
-                snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n",
+                dev_info(emu->card->dev,
+                         "emu1010: firmware file = %s, size = 0x%zx\n",
                            filename, emu->firmware->size);
         }
 
         err = snd_emu1010_load_firmware(emu, emu->firmware);
         if (err != 0) {
-                snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n");
+                dev_info(emu->card->dev, "emu1010: Loading Firmware failed\n");
                 return err;
         }
 
@@ -897,21 +908,23 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
         snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
         if ((reg & 0x3f) != 0x15) {
                 /* FPGA failed to be programmed */
-                snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file failed, reg = 0x%x\n", reg);
+                dev_info(emu->card->dev,
+                         "emu1010: Loading Hana Firmware file failed, reg = 0x%x\n",
+                         reg);
                 return -ENODEV;
         }
 
-        snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
+        dev_info(emu->card->dev, "emu1010: Hana Firmware loaded\n");
         snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
         snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
-        snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
+        dev_info(emu->card->dev, "emu1010: Hana version: %u.%u\n", tmp, tmp2);
         /* Enable 48Volt power to Audio Dock */
         snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
 
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
-        snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);
+        dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
-        snd_printk(KERN_INFO "emu1010: Card options = 0x%x\n", reg);
+        dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp);
         /* Optical -> ADAT I/O  */
         /* 0 : SPDIF
@@ -950,7 +963,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
         snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);
 
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
-        snd_printk(KERN_INFO "emu1010: Card options3 = 0x%x\n", reg);
+        dev_info(emu->card->dev, "emu1010: Card options3 = 0x%x\n", reg);
         /* Default WCLK set to 48kHz. */
         snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);
         /* Word Clock source, Internal 48kHz x1 */
@@ -1808,7 +1821,9 @@ int snd_emu10k1_create(struct snd_card *card,
         emu->revision = pci->revision;
         pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);
         pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);
-        snd_printdd("vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n", pci->vendor, pci->device, emu->serial, emu->model);
+        dev_dbg(card->dev,
+                "vendor = 0x%x, device = 0x%x, subsystem_vendor_id = 0x%x, subsystem_id = 0x%x\n",
+                pci->vendor, pci->device, emu->serial, emu->model);
 
         for (c = emu_chip_details; c->vendor; c++) {
                 if (c->vendor == pci->vendor && c->device == pci->device) {
@@ -1827,21 +1842,21 @@ int snd_emu10k1_create(struct snd_card *card,
                 }
         }
         if (c->vendor == 0) {
-                snd_printk(KERN_ERR "emu10k1: Card not recognised\n");
+                dev_err(card->dev, "emu10k1: Card not recognised\n");
                 kfree(emu);
                 pci_disable_device(pci);
                 return -ENOENT;
         }
         emu->card_capabilities = c;
         if (c->subsystem && !subsystem)
-                snd_printdd("Sound card name = %s\n", c->name);
+                dev_dbg(card->dev, "Sound card name = %s\n", c->name);
         else if (subsystem)
-                snd_printdd("Sound card name = %s, "
+                dev_dbg(card->dev, "Sound card name = %s, "
                         "vendor = 0x%x, device = 0x%x, subsystem = 0x%x. "
                         "Forced to subsystem = 0x%x\n", c->name,
                         pci->vendor, pci->device, emu->serial, c->subsystem);
         else
-                snd_printdd("Sound card name = %s, "
+                dev_dbg(card->dev, "Sound card name = %s, "
                         "vendor = 0x%x, device = 0x%x, subsystem = 0x%x.\n",
                         c->name, pci->vendor, pci->device,
                         emu->serial);
@@ -1869,7 +1884,9 @@ int snd_emu10k1_create(struct snd_card *card,
         emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
         if (pci_set_dma_mask(pci, emu->dma_mask) < 0 ||
             pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {
-                snd_printk(KERN_ERR "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask);
+                dev_err(card->dev,
+                        "architecture does not support PCI busmaster DMA with mask 0x%lx\n",
+                        emu->dma_mask);
                 kfree(emu);
                 pci_disable_device(pci);
                 return -ENXIO;