diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2016-03-01 17:39:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-02 12:02:44 +0100 |
| commit | 6d8044b4ff305238503edca7d75f3ab7410396ba (patch) | |
| tree | 81a60d200116c9b786e72bacf61fd69c2b8f5ac4 /sound/soc | |
| parent | ASoC: rsnd: rsnd_write() / rsnd_bset() uses regmap _force_ function (diff) | |
| download | linux-6d8044b4ff305238503edca7d75f3ab7410396ba.tar.xz linux-6d8044b4ff305238503edca7d75f3ab7410396ba.zip | |
ASoC: sh: rcar: core: don't open code of_device_get_match_data()
This change will also make Coverity happy by avoiding a theoretical NULL
pointer dereference; yet another reason is to use the above helper function
to tighten the code and make it more readable.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 21e13b3a356f..ba37b0d55b21 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1119,7 +1119,6 @@ static int rsnd_probe(struct platform_device *pdev) struct rsnd_priv *priv; struct device *dev = &pdev->dev; struct rsnd_dai *rdai; - const struct of_device_id *of_id = of_match_device(rsnd_of_match, dev); int (*probe_func[])(struct rsnd_priv *priv) = { rsnd_gen_probe, rsnd_dma_probe, @@ -1145,7 +1144,7 @@ static int rsnd_probe(struct platform_device *pdev) } priv->pdev = pdev; - priv->flags = (unsigned long)of_id->data; + priv->flags = (unsigned long)of_device_get_match_data(dev); spin_lock_init(&priv->lock); /* |