ASoC: sh: siu_pcm: remove snd_pcm_ops

snd_pcm_ops is no longer needed.
Let's use component driver callback.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87wodn90f7.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 78c3145b4109ff3ecd4bb93a9430c636c1b7d9de..a5e21e554da2d58ae1b3e7089ec7b4b43ef40af8 100644 (file)
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -281,7 +281,8 @@ static int siu_pcm_stmread_stop(struct siu_port *port_info)
        return 0;
 }
 
-static int siu_pcm_hw_params(struct snd_pcm_substream *ss,
+static int siu_pcm_hw_params(struct snd_soc_component *component,
+                            struct snd_pcm_substream *ss,
                             struct snd_pcm_hw_params *hw_params)
 {
        struct siu_info *info = siu_i2s_data;
@@ -297,7 +298,8 @@ static int siu_pcm_hw_params(struct snd_pcm_substream *ss,
        return ret;
 }
 
-static int siu_pcm_hw_free(struct snd_pcm_substream *ss)
+static int siu_pcm_hw_free(struct snd_soc_component *component,
+                          struct snd_pcm_substream *ss)
 {
        struct siu_info *info = siu_i2s_data;
        struct siu_port *port_info = siu_port_info(ss);
@@ -324,11 +326,10 @@ static bool filter(struct dma_chan *chan, void *slave)
        return true;
 }
 
-static int siu_pcm_open(struct snd_pcm_substream *ss)
+static int siu_pcm_open(struct snd_soc_component *component,
+                       struct snd_pcm_substream *ss)
 {
        /* Playback / Capture */
-       struct snd_soc_pcm_runtime *rtd = ss->private_data;
-       struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME);
        struct siu_platform *pdata = component->dev->platform_data;
        struct siu_info *info = siu_i2s_data;
        struct siu_port *port_info = siu_port_info(ss);
@@ -367,7 +368,8 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)
        return 0;
 }
 
-static int siu_pcm_close(struct snd_pcm_substream *ss)
+static int siu_pcm_close(struct snd_soc_component *component,
+                        struct snd_pcm_substream *ss)
 {
        struct siu_info *info = siu_i2s_data;
        struct device *dev = ss->pcm->card->dev;
@@ -389,7 +391,8 @@ static int siu_pcm_close(struct snd_pcm_substream *ss)
        return 0;
 }
 
-static int siu_pcm_prepare(struct snd_pcm_substream *ss)
+static int siu_pcm_prepare(struct snd_soc_component *component,
+                          struct snd_pcm_substream *ss)
 {
        struct siu_info *info = siu_i2s_data;
        struct siu_port *port_info = siu_port_info(ss);
@@ -435,7 +438,8 @@ static int siu_pcm_prepare(struct snd_pcm_substream *ss)
        return 0;
 }
 
-static int siu_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
+static int siu_pcm_trigger(struct snd_soc_component *component,
+                          struct snd_pcm_substream *ss, int cmd)
 {
        struct siu_info *info = siu_i2s_data;
        struct device *dev = ss->pcm->card->dev;
@@ -477,7 +481,9 @@ static int siu_pcm_trigger(struct snd_pcm_substream *ss, int cmd)
  * So far only resolution of one period is supported, subject to extending the
  * dmangine API
  */
-static snd_pcm_uframes_t siu_pcm_pointer_dma(struct snd_pcm_substream *ss)
+static snd_pcm_uframes_t
+siu_pcm_pointer_dma(struct snd_soc_component *component,
+                   struct snd_pcm_substream *ss)
 {
        struct device *dev = ss->pcm->card->dev;
        struct siu_info *info = siu_i2s_data;
@@ -512,7 +518,8 @@ static snd_pcm_uframes_t siu_pcm_pointer_dma(struct snd_pcm_substream *ss)
        return bytes_to_frames(ss->runtime, ptr);
 }
 
-static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)
+static int siu_pcm_new(struct snd_soc_component *component,
+                      struct snd_soc_pcm_runtime *rtd)
 {
        /* card->dev == socdev->dev, see snd_soc_new_pcms() */
        struct snd_card *card = rtd->card->snd_card;
@@ -558,7 +565,8 @@ static int siu_pcm_new(struct snd_soc_pcm_runtime *rtd)
        return 0;
 }
 
-static void siu_pcm_free(struct snd_pcm *pcm)
+static void siu_pcm_free(struct snd_soc_component *component,
+                        struct snd_pcm *pcm)
 {
        struct platform_device *pdev = to_platform_device(pcm->card->dev);
        struct siu_port *port_info = siu_ports[pdev->id];
@@ -571,21 +579,17 @@ static void siu_pcm_free(struct snd_pcm *pcm)
        dev_dbg(pcm->card->dev, "%s\n", __func__);
 }
 
-static const struct snd_pcm_ops siu_pcm_ops = {
+struct const snd_soc_component_driver siu_component = {
+       .name           = DRV_NAME,
        .open           = siu_pcm_open,
        .close          = siu_pcm_close,
-       .ioctl          = snd_pcm_lib_ioctl,
+       .ioctl          = snd_soc_pcm_lib_ioctl,
        .hw_params      = siu_pcm_hw_params,
        .hw_free        = siu_pcm_hw_free,
        .prepare        = siu_pcm_prepare,
        .trigger        = siu_pcm_trigger,
        .pointer        = siu_pcm_pointer_dma,
-};
-
-struct snd_soc_component_driver siu_component = {
-       .name           = DRV_NAME,
-       .ops                    = &siu_pcm_ops,
-       .pcm_new        = siu_pcm_new,
-       .pcm_free       = siu_pcm_free,
+       .pcm_construct  = siu_pcm_new,
+       .pcm_destruct   = siu_pcm_free,
 };
 EXPORT_SYMBOL_GPL(siu_component);