Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc...

[sfrench/cifs-2.6.git] / sound / soc / codecs / max9867.c

diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c
index 42e2e407e287c4dc0354a00d864e8b997fcacbfa..0247edc9c84ebebfc0e9150e3b1b7c408659b1a6 100644 (file)
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
@@ -309,7 +309,6 @@ static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai,
        struct snd_soc_codec *codec = codec_dai->codec;
        struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec);
        u8 iface1A = 0, iface1B = 0;
        struct snd_soc_codec *codec = codec_dai->codec;
        struct max9867_priv *max9867 = snd_soc_codec_get_drvdata(codec);
        u8 iface1A = 0, iface1B = 0;

-       int ret;

 
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBM_CFM:
 
        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
        case SND_SOC_DAIFMT_CBM_CFM:


@@ -346,8 +345,8 @@ static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai,
                return -EINVAL;
        }
 
                return -EINVAL;
        }
 

-       ret = regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
-       ret = regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);
+       regmap_write(max9867->regmap, MAX9867_IFC1A, iface1A);
+       regmap_write(max9867->regmap, MAX9867_IFC1B, iface1B);

        return 0;
 }
 
        return 0;
 }
 


@@ -517,13 +516,13 @@ static const struct i2c_device_id max9867_i2c_id[] = {
        { "max9867", 0 },
        { }
 };
        { "max9867", 0 },
        { }
 };

+MODULE_DEVICE_TABLE(i2c, max9867_i2c_id);

 
 static const struct of_device_id max9867_of_match[] = {
        { .compatible = "maxim,max9867", },
        { }
 };
 
 static const struct of_device_id max9867_of_match[] = {
        { .compatible = "maxim,max9867", },
        { }
 };

-
-MODULE_DEVICE_TABLE(i2c, max9867_i2c_id);
+MODULE_DEVICE_TABLE(of, max9867_of_match);

 
 static const struct dev_pm_ops max9867_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(max9867_suspend, max9867_resume)
 
 static const struct dev_pm_ops max9867_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(max9867_suspend, max9867_resume)