redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: Kevin Cernekee <cernekee@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kevin Cernekee 2015-05-05 15:52:29 -07:00 committed by Mark Brown
parent 5676f5c3fd
commit 97fceb4db5
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sound/soc/codecs/tas571x.c
View file

@ -377,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);
@ -384,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) {