ASoC: fsl: Drop unused argument from imx_pcm_dma_init()

Since 70d435ba1cd ("ASoC: imx-pcm-dma: simplify pcm_config") the size
argument to imx_pcm_dma_init() is unused, so drop it. Also remove the
now unused defines that the users of imx_pcm_dma_init() used to pass the
size argument

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Link: https://lore.kernel.org/r/20220223130625.3430589-1-s.hauer@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl_aud2htx.c b/sound/soc/fsl/fsl_aud2htx.c
index 99ab7f0241cf3346d176ef25948016f02cd49236..422922146f2a53b10128f6bd81313c35f6190b1a 100644 (file)
--- a/sound/soc/fsl/fsl_aud2htx.c
+++ b/sound/soc/fsl/fsl_aud2htx.c
@@ -241,7 +241,7 @@ static int fsl_aud2htx_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = imx_pcm_dma_init(pdev, IMX_DEFAULT_DMABUF_SIZE);
+       ret = imx_pcm_dma_init(pdev);
        if (ret)
                dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);
 

diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 3a9e2df4e16f6144ec8863ff9381c3222c45add1..ed444e8f1d6bf68eecf63242205b31f413ce0b37 100644 (file)
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -1077,7 +1077,7 @@ static int fsl_esai_probe(struct platform_device *pdev)
         * Register platform component before registering cpu dai for there
         * is not defer probe for platform component in snd_soc_add_pcm_runtime().
         */
-       ret = imx_pcm_dma_init(pdev, IMX_ESAI_DMABUF_SIZE);
+       ret = imx_pcm_dma_init(pdev);
        if (ret) {
                dev_err(&pdev->dev, "failed to init imx pcm dma: %d\n", ret);
                goto err_pm_get_sync;

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index cab015d968898ec748e488a68928970d137826a1..c2d423d1d87eded7c101496fc1ef924bd27e7182 100644 (file)
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -1161,7 +1161,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
         * is not defer probe for platform component in snd_soc_add_pcm_runtime().
         */
        if (sai->soc_data->use_imx_pcm) {
-               ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE);
+               ret = imx_pcm_dma_init(pdev);
                if (ret)
                        goto err_pm_get_sync;
        } else {

diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index d178b479c8bd47a7db40554106b5efac4ef5c15d..57c41b2f7d1774b0ce34794f23de86bdd79c1ced 100644 (file)
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -1522,7 +1522,7 @@ static int fsl_spdif_probe(struct platform_device *pdev)
         * Register platform component before registering cpu dai for there
         * is not defer probe for platform component in snd_soc_add_pcm_runtime().
         */
-       ret = imx_pcm_dma_init(pdev, IMX_SPDIF_DMABUF_SIZE);
+       ret = imx_pcm_dma_init(pdev);
        if (ret) {
                dev_err_probe(&pdev->dev, ret, "imx_pcm_dma_init failed\n");
                goto err_pm_disable;

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 1169d1104b9e8607f3a6983367f929a915b8b92d..ca30a4ede076edfdc85709dd235549b59aff1bbe 100644 (file)
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1372,7 +1372,7 @@ static int fsl_ssi_imx_probe(struct platform_device *pdev,
                if (ret)
                        goto error_pcm;
        } else {
-               ret = imx_pcm_dma_init(pdev, IMX_SSI_DMABUF_SIZE);
+               ret = imx_pcm_dma_init(pdev);
                if (ret)
                        goto error_pcm;
        }

diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 04a9bc749016d40240cd868278cacf18488e58aa..14e94270911cfb12249aed5489cf2cb5fc9ca633 100644 (file)
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -34,7 +34,7 @@ static const struct snd_dmaengine_pcm_config imx_dmaengine_pcm_config = {
        .compat_filter_fn = filter,
 };
 
-int imx_pcm_dma_init(struct platform_device *pdev, size_t size)
+int imx_pcm_dma_init(struct platform_device *pdev)
 {
        struct snd_dmaengine_pcm_config *config;
 

diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
index 5dd406774d3eac48f0dc473fe595e1115a11dd85..5c6cf1ca8c8ab82461af853a188cb52aa55aed18 100644 (file)
--- a/sound/soc/fsl/imx-pcm.h
+++ b/sound/soc/fsl/imx-pcm.h
@@ -17,9 +17,6 @@
 #define IMX_SSI_DMABUF_SIZE    (64 * 1024)
 
 #define IMX_DEFAULT_DMABUF_SIZE        (64 * 1024)
-#define IMX_SAI_DMABUF_SIZE    (64 * 1024)
-#define IMX_SPDIF_DMABUF_SIZE  (64 * 1024)
-#define IMX_ESAI_DMABUF_SIZE   (256 * 1024)
 
 static inline void
 imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data,
@@ -40,9 +37,9 @@ struct imx_pcm_fiq_params {
 };
 
 #if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA)
-int imx_pcm_dma_init(struct platform_device *pdev, size_t size);
+int imx_pcm_dma_init(struct platform_device *pdev);
 #else
-static inline int imx_pcm_dma_init(struct platform_device *pdev, size_t size)
+static inline int imx_pcm_dma_init(struct platform_device *pdev)
 {
        return -ENODEV;
 }