diff options
| author | Kevin Cernekee <cernekee@chromium.org> | 2015-05-05 15:52:29 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-06 11:37:33 +0100 |
| commit | 97fceb4db529bb0ae6cab15fb34f59471cdd8c23 (patch) | |
| tree | 2c411996cfd97a1ad664430bdad82e5ceece964f /sound/soc/codecs/tas571x.c | |
| parent | 5676f5c3fde96ce36ac3839145eccd83671e2112 (diff) | |
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: Kevin Cernekee <cernekee@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/tas571x.c')
| -rw-r--r-- | sound/soc/codecs/tas571x.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/codecs/tas571x.c b/sound/soc/codecs/tas571x.c index b187ea53a7f9..85bcc374c8e8 100644 --- a/sound/soc/codecs/tas571x.c +++ b/sound/soc/codecs/tas571x.c @@ -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) { |