]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ASoC: codecs: Max98095: Fix logging of hardware revision.
authorTaylor Hutt <thutt@chromium.org>
Mon, 20 Jun 2011 18:54:32 +0000 (11:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 21 Jun 2011 23:27:39 +0000 (00:27 +0100)
The base hardware revision of the Maxim 98095 part is 0x40; the code
which outputs the revision of the hardware has been updated to
properly use uppercase alphabetic values for the revision numbers.

Also, the use of a constant for the length 'max98095_dai' has been
replaced with ARRAY_SIZE().

Signed-off-by: Taylor Hutt <thutt@chromium.org>
Acked-by: Peter Hsiang <peter.hsiang@maxim-ic.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/max98095.c

index 872a5fa4bf1ff81ed11225a08cd8532a97dc0a06..668434d44303ea6c84e748b9d6029ac8c6732977 100644 (file)
@@ -2259,11 +2259,11 @@ static int max98095_probe(struct snd_soc_codec *codec)
 
        ret = snd_soc_read(codec, M98095_0FF_REV_ID);
        if (ret < 0) {
-               dev_err(codec->dev, "Failed to read device revision: %d\n",
+               dev_err(codec->dev, "Failure reading hardware revision: %d\n",
                        ret);
                goto err_access;
        }
-       dev_info(codec->dev, "revision %c\n", ret + 'A');
+       dev_info(codec->dev, "Hardware revision: %c\n", ret - 0x40 + 'A');
 
        snd_soc_write(codec, M98095_097_PWR_SYS, M98095_PWRSV);
 
@@ -2340,8 +2340,8 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
        max98095->control_data = i2c;
        max98095->pdata = i2c->dev.platform_data;
 
-       ret = snd_soc_register_codec(&i2c->dev,
-                       &soc_codec_dev_max98095, &max98095_dai[0], 3);
+       ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98095,
+                                    max98095_dai, ARRAY_SIZE(max98095_dai));
        if (ret < 0)
                kfree(max98095);
        return ret;