Commit 97fceb4d authored by Kevin Cernekee's avatar Kevin Cernekee Committed by Mark Brown

ASoC: tas571x: Eliminate redundant dev->of_node NULL check

of_match_device() checks if dev->of_node is NULL, so we don't need to do
it again in the probe function.
Signed-off-by: default avatarKevin Cernekee <cernekee@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5676f5c3
...@@ -377,6 +377,7 @@ static int tas571x_i2c_probe(struct i2c_client *client, ...@@ -377,6 +377,7 @@ static int tas571x_i2c_probe(struct i2c_client *client,
{ {
struct tas571x_private *priv; struct tas571x_private *priv;
struct device *dev = &client->dev; struct device *dev = &client->dev;
const struct of_device_id *of_id;
int i, ret; int i, ret;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
...@@ -384,18 +385,12 @@ static int tas571x_i2c_probe(struct i2c_client *client, ...@@ -384,18 +385,12 @@ static int tas571x_i2c_probe(struct i2c_client *client,
return -ENOMEM; return -ENOMEM;
i2c_set_clientdata(client, priv); i2c_set_clientdata(client, priv);
if (dev->of_node) { of_id = of_match_device(tas571x_of_match, dev);
const struct of_device_id *of_id; if (!of_id) {
of_id = of_match_device(tas571x_of_match, dev);
if (of_id)
priv->chip = of_id->data;
}
if (!priv->chip) {
dev_err(dev, "Unknown device type\n"); dev_err(dev, "Unknown device type\n");
return -EINVAL; return -EINVAL;
} }
priv->chip = of_id->data;
priv->mclk = devm_clk_get(dev, "mclk"); priv->mclk = devm_clk_get(dev, "mclk");
if (IS_ERR(priv->mclk) && PTR_ERR(priv->mclk) != -ENOENT) { if (IS_ERR(priv->mclk) && PTR_ERR(priv->mclk) != -ENOENT) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment