ALSA: sh: Use standard print API

Use the standard print API with dev_*() instead of the old house-baked
one.  It gives better information and allows dynamically control of
debug prints.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-51-tiwai@suse.de

diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index 3182c634464d4288dd1bb8faca39481b5806e85e..936cd6e91529c83e502c3bbc89a06805a2fd5404 100644 (file)
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -75,8 +75,7 @@ static void spu_write_wait(void)
                /* To ensure hardware failure doesn't wedge kernel */
                time_count++;
                if (time_count > 0x10000) {
-                       snd_printk
-                           ("WARNING: G2 FIFO appears to be blocked.\n");
+                       pr_warn("WARNING: G2 FIFO appears to be blocked.\n");
                        break;
                }
        }
@@ -591,8 +590,8 @@ static int snd_aica_probe(struct platform_device *devptr)
        if (unlikely(err < 0))
                goto freedreamcast;
        platform_set_drvdata(devptr, dreamcastcard);
-       snd_printk
-           ("ALSA Driver for Yamaha AICA Super Intelligent Sound Processor\n");
+       dev_info(&devptr->dev,
+                "ALSA Driver for Yamaha AICA Super Intelligent Sound Processor\n");
        return 0;
       freedreamcast:
        snd_card_free(dreamcastcard->card);

diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c
index 95ba3abd4e47eb73bbcd83303b0a071fd42f7d19..e7b6ce7bd086bd11eb0be5e3b8b7eef9bb5ed1aa 100644 (file)
--- a/sound/sh/sh_dac_audio.c
+++ b/sound/sh/sh_dac_audio.c
@@ -348,8 +348,8 @@ static int snd_sh_dac_probe(struct platform_device *devptr)
 
        err = snd_card_new(&devptr->dev, index, id, THIS_MODULE, 0, &card);
        if (err < 0) {
-                       snd_printk(KERN_ERR "cannot allocate the card\n");
-                       return err;
+               dev_err(&devptr->dev, "cannot allocate the card\n");
+               return err;
        }
 
        err = snd_sh_dac_create(card, devptr, &chip);
@@ -362,13 +362,13 @@ static int snd_sh_dac_probe(struct platform_device *devptr)
 
        strcpy(card->driver, "snd_sh_dac");
        strcpy(card->shortname, "SuperH DAC audio driver");
-       printk(KERN_INFO "%s %s", card->longname, card->shortname);
+       dev_info(&devptr->dev, "%s %s\n", card->longname, card->shortname);
 
        err = snd_card_register(card);
        if (err < 0)
                goto probe_error;
 
-       snd_printk(KERN_INFO "ALSA driver for SuperH DAC audio");
+       dev_info(&devptr->dev, "ALSA driver for SuperH DAC audio\n");
 
        platform_set_drvdata(devptr, card);
        return 0;