]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: sam9g20_wm8731: use dev_*() logging functions
authorLadislav Michl <ladis@linux-mips.org>
Mon, 15 Jan 2018 07:52:54 +0000 (08:52 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 22 Jan 2018 12:23:51 +0000 (12:23 +0000)
Use dev_*() logging functions instead of plain printk and as
messages are now properly prefixed drop 'ASoC' prefix as well.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/atmel/sam9g20_wm8731.c

index d7469cdd90dc854a9f0db0dd5c666948ecf9bdf3..98f93e79c65472e33a161dca7b75968a7c4784d8 100644 (file)
@@ -110,16 +110,15 @@ static const struct snd_soc_dapm_route intercon[] = {
 static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+       struct device *dev = rtd->dev;
        int ret;
 
-       printk(KERN_DEBUG
-                       "at91sam9g20ek_wm8731 "
-                       ": at91sam9g20ek_wm8731_init() called\n");
+       dev_dbg(dev, "%s called\n", __func__);
 
        ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_MCLK,
-               MCLK_RATE, SND_SOC_CLOCK_IN);
+                                    MCLK_RATE, SND_SOC_CLOCK_IN);
        if (ret < 0) {
-               printk(KERN_ERR "Failed to set WM8731 SYSCLK: %d\n", ret);
+               dev_err(dev, "Failed to set WM8731 SYSCLK: %d\n", ret);
                return ret;
        }
 
@@ -179,21 +178,21 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
         */
        mclk = clk_get(NULL, "pck0");
        if (IS_ERR(mclk)) {
-               printk(KERN_ERR "ASoC: Failed to get MCLK\n");
+               dev_err(&pdev->dev, "Failed to get MCLK\n");
                ret = PTR_ERR(mclk);
                goto err;
        }
 
        pllb = clk_get(NULL, "pllb");
        if (IS_ERR(pllb)) {
-               printk(KERN_ERR "ASoC: Failed to get PLLB\n");
+               dev_err(&pdev->dev, "Failed to get PLLB\n");
                ret = PTR_ERR(pllb);
                goto err_mclk;
        }
        ret = clk_set_parent(mclk, pllb);
        clk_put(pllb);
        if (ret != 0) {
-               printk(KERN_ERR "ASoC: Failed to set MCLK parent\n");
+               dev_err(&pdev->dev, "Failed to set MCLK parent\n");
                goto err_mclk;
        }
 
@@ -236,7 +235,7 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev)
 
        ret = snd_soc_register_card(card);
        if (ret) {
-               printk(KERN_ERR "ASoC: snd_soc_register_card() failed\n");
+               dev_err(&pdev->dev, "snd_soc_register_card() failed\n");
        }
 
        return ret;