ASoC: rsnd: remove struct rsnd_of_data

No board is using Renesas sound driver via platform boot now.
This means all user is using DT boot. Platform boot support is
no longer needed. But, it strongly depends on platform boot style.
Now, platform boot style was removed from driver.
This is cleanup patch, and remove pointless struct rsnd_of_data

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 1dffde3218be8e0151c3b5343e78ed022a9308d2..ba80961a8fa8c0f5780103d12adb8c5d47a39fc5 100644 (file)
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -516,7 +516,6 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
 }
 
 int rsnd_adg_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct rsnd_adg *adg;

diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c
index 47ef47c22217109990d534da76df12aa5fa25f22..2294c5c7a25aa3cd65e2d7d78fac9144d9917089 100644 (file)
--- a/sound/soc/sh/rcar/cmd.c
+++ b/sound/soc/sh/rcar/cmd.c
@@ -128,7 +128,6 @@ struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id)
 }
 
 int rsnd_cmd_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device *dev = rsnd_priv_to_dev(priv);

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 6043c71d10c924510d445dbb2e297bce45c840bc..8b9d721acb41132f16362ad30c1943f62e6c853a 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -99,18 +99,10 @@
 #define RSND_RATES SNDRV_PCM_RATE_8000_96000
 #define RSND_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
 
-static const struct rsnd_of_data rsnd_of_data_gen1 = {
-       .flags = RSND_GEN1,
-};
-
-static const struct rsnd_of_data rsnd_of_data_gen2 = {
-       .flags = RSND_GEN2,
-};
-
 static const struct of_device_id rsnd_of_match[] = {
-       { .compatible = "renesas,rcar_sound-gen1", .data = &rsnd_of_data_gen1 },
-       { .compatible = "renesas,rcar_sound-gen2", .data = &rsnd_of_data_gen2 },
-       { .compatible = "renesas,rcar_sound-gen3", .data = &rsnd_of_data_gen2 }, /* gen2 compatible */
+       { .compatible = "renesas,rcar_sound-gen1", .data = (void *)RSND_GEN1 },
+       { .compatible = "renesas,rcar_sound-gen2", .data = (void *)RSND_GEN2 },
+       { .compatible = "renesas,rcar_sound-gen3", .data = (void *)RSND_GEN2 }, /* gen2 compatible */
        {},
 };
 MODULE_DEVICE_TABLE(of, rsnd_of_match);
@@ -569,7 +561,6 @@ static const struct snd_soc_dai_ops rsnd_soc_dai_ops = {
 };
 
 static int rsnd_dai_probe(struct platform_device *pdev,
-                         const struct rsnd_of_data *of_data,
                          struct rsnd_priv *priv)
 {
        struct device_node *dai_node;
@@ -583,9 +574,6 @@ static int rsnd_dai_probe(struct platform_device *pdev,
        int nr, dai_i, io_i, np_i;
        int ret;
 
-       if (!of_data)
-               return 0;
-
        dai_node = rsnd_dai_of_node(priv);
        nr = of_get_child_count(dai_node);
        if (!nr) {
@@ -1002,9 +990,7 @@ static int rsnd_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct rsnd_dai *rdai;
        const struct of_device_id *of_id = of_match_device(rsnd_of_match, dev);
-       const struct rsnd_of_data *of_data;
        int (*probe_func[])(struct platform_device *pdev,
-                           const struct rsnd_of_data *of_data,
                            struct rsnd_priv *priv) = {
                rsnd_gen_probe,
                rsnd_dma_probe,
@@ -1024,7 +1010,6 @@ static int rsnd_probe(struct platform_device *pdev)
                            GFP_KERNEL);
        if (!info)
                return -ENOMEM;
-       of_data = of_id->data;
 
        /*
         *      init priv data
@@ -1037,14 +1022,14 @@ static int rsnd_probe(struct platform_device *pdev)
 
        priv->pdev      = pdev;
        priv->info      = info;
-       priv->flags     = of_data->flags;
+       priv->flags     = (u32)of_id->data;
        spin_lock_init(&priv->lock);
 
        /*
         *      init each module
         */
        for (i = 0; i < ARRAY_SIZE(probe_func); i++) {
-               ret = probe_func[i](pdev, of_data, priv);
+               ret = probe_func[i](pdev, priv);
                if (ret)
                        return ret;
        }

diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index 9506db4958bc66f39b0357444350b3cab0095b4a..3e36a5325ce46e93e8f919ced463dc7a3f0d1a62 100644 (file)
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -78,7 +78,6 @@ struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id)
 }
 
 int rsnd_ctu_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device_node *node;

diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 9917b985c4030b3c9665226e4a70f1c5dc378327..e5f435361d9655d5c89d5a1d3ffb254d8af3c9f3 100644 (file)
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -702,7 +702,6 @@ struct rsnd_mod *rsnd_dma_attach(struct rsnd_dai_stream *io,
 }
 
 int rsnd_dma_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device *dev = rsnd_priv_to_dev(priv);

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index a550b75ff9ac1d05649a1465881fb630f1c87f0d..d2c03bd94fcbb3045f28e0a2f7cf6a27518fccef 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -305,7 +305,6 @@ struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id)
 }
 
 int rsnd_dvc_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device_node *node;

diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 099a1cd2d24580699712b52ebfc9e9b725e452de..ced8acb7a7ecd73374a3db0fa41095b9cf82ef9e 100644 (file)
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -350,7 +350,6 @@ static int rsnd_gen1_probe(struct platform_device *pdev,
  *             Gen
  */
 int rsnd_gen_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device *dev = rsnd_priv_to_dev(priv);

diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index 8b615c7aecb4ac2f7b39e311e94dc1fcbe9bdfec..897e4f3d4c24b0d485510f505f484ca674287d92 100644 (file)
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -117,7 +117,6 @@ struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id)
 }
 
 int rsnd_mix_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device_node *node;

diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index c1cf16db6405847641ba9986265aeff82bc0a0ed..0ad3d0d20a811b86a3dc9ea8fcb6bb51b4e235ec 100644 (file)
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -115,7 +115,6 @@ enum rsnd_reg {
        RSND_REG_MAX,
 };
 
-struct rsnd_of_data;
 struct rsnd_priv;
 struct rsnd_mod;
 struct rsnd_dai;
@@ -150,7 +149,6 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io);
 struct rsnd_mod *rsnd_dma_attach(struct rsnd_dai_stream *io,
                               struct rsnd_mod *mod, int id);
 int rsnd_dma_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,
                                          struct rsnd_mod *mod, char *name);
@@ -345,7 +343,6 @@ int rsnd_dai_connect(struct rsnd_mod *mod,
  *     R-Car Gen1/Gen2
  */
 int rsnd_gen_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
                               struct rsnd_mod *mod,
@@ -358,7 +355,6 @@ phys_addr_t rsnd_gen_get_phy_addr(struct rsnd_priv *priv, int reg_id);
 int rsnd_adg_ssi_clk_stop(struct rsnd_mod *mod);
 int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *mod, unsigned int rate);
 int rsnd_adg_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 void rsnd_adg_remove(struct platform_device *pdev,
                     struct rsnd_priv *priv);
@@ -374,10 +370,6 @@ int rsnd_adg_set_cmd_timsel_gen2(struct rsnd_mod *mod,
 /*
  *     R-Car sound priv
  */
-struct rsnd_of_data {
-       u32 flags;
-};
-
 struct rsnd_priv {
 
        struct platform_device *pdev;
@@ -515,7 +507,6 @@ int rsnd_kctrl_new_e(struct rsnd_mod *mod,
  *     R-Car SSI
  */
 int rsnd_ssi_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 void rsnd_ssi_remove(struct platform_device *pdev,
                     struct rsnd_priv *priv);
@@ -536,7 +527,6 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod);
 int rsnd_ssiu_attach(struct rsnd_dai_stream *io,
                     struct rsnd_mod *mod);
 int rsnd_ssiu_probe(struct platform_device *pdev,
-                   const struct rsnd_of_data *of_data,
                    struct rsnd_priv *priv);
 void rsnd_ssiu_remove(struct platform_device *pdev,
                      struct rsnd_priv *priv);
@@ -545,7 +535,6 @@ void rsnd_ssiu_remove(struct platform_device *pdev,
  *     R-Car SRC
  */
 int rsnd_src_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 void rsnd_src_remove(struct platform_device *pdev,
                     struct rsnd_priv *priv);
@@ -560,7 +549,6 @@ unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
  *     R-Car CTU
  */
 int rsnd_ctu_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 
 void rsnd_ctu_remove(struct platform_device *pdev,
@@ -573,7 +561,6 @@ struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id);
  *     R-Car MIX
  */
 int rsnd_mix_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 
 void rsnd_mix_remove(struct platform_device *pdev,
@@ -586,7 +573,6 @@ struct rsnd_mod *rsnd_mix_mod_get(struct rsnd_priv *priv, int id);
  *     R-Car DVC
  */
 int rsnd_dvc_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 void rsnd_dvc_remove(struct platform_device *pdev,
                     struct rsnd_priv *priv);
@@ -598,7 +584,6 @@ struct rsnd_mod *rsnd_dvc_mod_get(struct rsnd_priv *priv, int id);
  *     R-Car CMD
  */
 int rsnd_cmd_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv);
 void rsnd_cmd_remove(struct platform_device *pdev,
                     struct rsnd_priv *priv);

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index f965fea7aa50f87aa83e79497daf3e6a4660b696..c0f7e2a4b688a8ee28cf73956d5f59f72ba33a8d 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -554,7 +554,6 @@ struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id)
 }
 
 int rsnd_src_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device_node *node;

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 1f1ecedabb5d00015fb4ae1df8134b8ba441492e..848c06436226ac77308f0070a4d109ee26c7e9de 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -724,7 +724,6 @@ int __rsnd_ssi_is_pin_sharing(struct rsnd_mod *mod)
 }
 
 int rsnd_ssi_probe(struct platform_device *pdev,
-                  const struct rsnd_of_data *of_data,
                   struct rsnd_priv *priv)
 {
        struct device_node *node;

diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index fc5ec17fe37e2e2854df5ec073e4cb995f1786aa..89b1bc77cb8a4d17145cb8c2a04737086383a98f 100644 (file)
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -137,7 +137,6 @@ int rsnd_ssiu_attach(struct rsnd_dai_stream *io,
 }
 
 int rsnd_ssiu_probe(struct platform_device *pdev,
-                   const struct rsnd_of_data *of_data,
                    struct rsnd_priv *priv)
 {
        struct device *dev = rsnd_priv_to_dev(priv);