Merge remote-tracking branch 'asoc/topic/rt5670' into asoc-next

[deliverable/linux.git] / sound / soc / codecs / tas571x.c

diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c
index ffdf4839749125e584df6f54159786e18768fdc6..85bcc374c8e8e34e99f008d0f542deebbdab9e49 100644 (file)
--- a/sound/soc/codecs/tas571x.c
+++ b/sound/soc/codecs/tas571x.c
@@ -208,7 +208,6 @@ static int tas571x_set_bias_level(struct snd_soc_codec *codec,
                break;
        }
 
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -378,6 +377,7 @@ static int tas571x_i2c_probe(struct i2c_client *client,
 {
        struct tas571x_private *priv;
        struct device *dev = &client->dev;
+       const struct of_device_id *of_id;
        int i, ret;
 
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -385,18 +385,12 @@ static int tas571x_i2c_probe(struct i2c_client *client,
                return -ENOMEM;
        i2c_set_clientdata(client, priv);
 
-       if (dev->of_node) {
-               const struct of_device_id *of_id;
-
-               of_id = of_match_device(tas571x_of_match, dev);
-               if (of_id)
-                       priv->chip = of_id->data;
-       }
-
-       if (!priv->chip) {
+       of_id = of_match_device(tas571x_of_match, dev);
+       if (!of_id) {
                dev_err(dev, "Unknown device type\n");
                return -EINVAL;
        }
+       priv->chip = of_id->data;
 
        priv->mclk = devm_clk_get(dev, "mclk");
        if (IS_ERR(priv->mclk) && PTR_ERR(priv->mclk) != -ENOENT) {