Commit dcc448e6 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown

ASoC: rsnd: Remove obsolete platform data support

Since commit 3d7608e4 ("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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 462c30bc
...@@ -1236,20 +1236,11 @@ static int rsnd_probe(struct platform_device *pdev) ...@@ -1236,20 +1236,11 @@ static int rsnd_probe(struct platform_device *pdev)
}; };
int ret, i; int ret, i;
info = NULL; info = devm_kzalloc(&pdev->dev, sizeof(struct rcar_snd_info),
of_data = NULL; GFP_KERNEL);
if (of_id) { if (!info)
info = devm_kzalloc(&pdev->dev, return -ENOMEM;
sizeof(struct rcar_snd_info), GFP_KERNEL);
of_data = of_id->data; 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;
}
/* /*
* init priv data * init priv data
......
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/sh_dma.h> #include <linux/sh_dma.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <sound/rcar_snd.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include "rcar_snd.h"
/* /*
* pseudo register * pseudo register
* *
......
...@@ -700,9 +700,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev, ...@@ -700,9 +700,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev,
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int nr, i; int nr, i;
if (!of_data)
return;
node = rsnd_ssi_of_node(priv); node = rsnd_ssi_of_node(priv);
if (!node) if (!node)
return; return;
......
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