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>

4 files changed, 7 insertions, 18 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
diff --git a/include/sound/rcar_snd.h b/sound/soc/sh/rcar/rcar_snd.h
index d8e33d38da43..d8e33d38da43 100644
--- a/include/sound/rcar_snd.h
+++ b/sound/soc/sh/rcar/rcar_snd.h
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index e4068d78616c..e9fef53968b4 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -21,10 +21,11 @@
 #include <linux/of_irq.h>
 #include <linux/sh_dma.h>
 #include <linux/workqueue.h>
-#include <sound/rcar_snd.h>
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
 
+#include "rcar_snd.h"
+
 /*
  *      pseudo register
  *
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 5e05f9422073..842a35b1363a 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -700,9 +700,6 @@ static void rsnd_of_parse_ssi(struct platform_device *pdev,
         struct device *dev = &pdev->dev;
         int nr, i;
 
-        if (!of_data)
-                return;
-
         node = rsnd_ssi_of_node(priv);
         if (!node)
                 return;