diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-10-07 12:42:22 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-07 12:19:51 +0100 |
| commit | dcc448e619194098b24477a6d56af50c57f26f1d (patch) | |
| tree | 8add6a35e898384d9a27357c4cbaef9eaa87d041 /sound/soc/sh/rcar/core.c | |
| parent | 462c30bc8b3457e2904c45babf4cb06c3b38ed4e (diff) | |
| download | linux-dcc448e619194098b24477a6d56af50c57f26f1d.tar.bz2 | |
ASoC: rsnd: Remove obsolete platform data support
Since commit 3d7608e4c169af03 ("ARM: shmobile: bockw: remove legacy
board file and config"), Renesas R-Car SoCs are only supported in
generic DT-only ARM multi-platform builds. The driver doesn't need to
use platform data anymore, hence remove platform data configuration.
Move <sound/rcar_snd.h> to sound/soc/sh/rcar/, as it's no longer needed
by platform code.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sh/rcar/core.c')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index eec294da81e3..6ef9a884ca7c 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1236,20 +1236,11 @@ static int rsnd_probe(struct platform_device *pdev) }; int ret, i; - info = NULL; - of_data = NULL; - if (of_id) { - info = devm_kzalloc(&pdev->dev, - sizeof(struct rcar_snd_info), GFP_KERNEL); - of_data = of_id->data; - } else { - info = pdev->dev.platform_data; - } - - if (!info) { - dev_err(dev, "driver needs R-Car sound information\n"); - return -ENODEV; - } + info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info), + GFP_KERNEL); + if (!info) + return -ENOMEM; + of_data = of_id->data; /* * init priv data |