[for-5.6,06/23] ASoC: fsl: Drop superfluous ioctl PCM ops
diff mbox series

Message ID 20191210145406.21419-7-tiwai@suse.de
State Accepted
Commit 6ac44ce9dfd6ba4dfb1d5e571131d132c53f23f1
Headers show
Series
  • ASoC: PCM API updates (part II)
Related show

Commit Message

Takashi Iwai Dec. 10, 2019, 2:53 p.m. UTC
ASoC PCM core deals the empty ioctl field now as default.
Let's kill the redundant lines.

Cc: Timur Tabi <timur@kernel.org>
Cc: Nicolin Chen <nicoleotsuka@gmail.com>
Cc: Xiubo Li <Xiubo.Lee@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/fsl/fsl_asrc_dma.c | 1 -
 sound/soc/fsl/fsl_dma.c      | 1 -
 sound/soc/fsl/imx-pcm-fiq.c  | 1 -
 sound/soc/fsl/mpc5200_dma.c  | 1 -
 4 files changed, 4 deletions(-)

Comments

Nicolin Chen Dec. 10, 2019, 9:47 p.m. UTC | #1
On Tue, Dec 10, 2019 at 03:53:49PM +0100, Takashi Iwai wrote:
> ASoC PCM core deals the empty ioctl field now as default.
> Let's kill the redundant lines.
> 
> Cc: Timur Tabi <timur@kernel.org>
> Cc: Nicolin Chen <nicoleotsuka@gmail.com>

Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>

> Cc: Xiubo Li <Xiubo.Lee@gmail.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  sound/soc/fsl/fsl_asrc_dma.c | 1 -
>  sound/soc/fsl/fsl_dma.c      | 1 -
>  sound/soc/fsl/imx-pcm-fiq.c  | 1 -
>  sound/soc/fsl/mpc5200_dma.c  | 1 -
>  4 files changed, 4 deletions(-)
> 
> diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
> index d6146de9acd2..79d66224c0a8 100644
> --- a/sound/soc/fsl/fsl_asrc_dma.c
> +++ b/sound/soc/fsl/fsl_asrc_dma.c
> @@ -428,7 +428,6 @@ static void fsl_asrc_dma_pcm_free(struct snd_soc_component *component,
>  
>  struct snd_soc_component_driver fsl_asrc_component = {
>  	.name		= DRV_NAME,
> -	.ioctl		= snd_soc_pcm_lib_ioctl,
>  	.hw_params	= fsl_asrc_dma_hw_params,
>  	.hw_free	= fsl_asrc_dma_hw_free,
>  	.trigger	= fsl_asrc_dma_trigger,
> diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
> index 2868c4f97cb2..13ae089c1911 100644
> --- a/sound/soc/fsl/fsl_dma.c
> +++ b/sound/soc/fsl/fsl_dma.c
> @@ -903,7 +903,6 @@ static int fsl_soc_dma_probe(struct platform_device *pdev)
>  	dma->dai.name = DRV_NAME;
>  	dma->dai.open = fsl_dma_open;
>  	dma->dai.close = fsl_dma_close;
> -	dma->dai.ioctl = snd_soc_pcm_lib_ioctl;
>  	dma->dai.hw_params = fsl_dma_hw_params;
>  	dma->dai.hw_free = fsl_dma_hw_free;
>  	dma->dai.pointer = fsl_dma_pointer;
> diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
> index 08131d147983..f20d5b1c3848 100644
> --- a/sound/soc/fsl/imx-pcm-fiq.c
> +++ b/sound/soc/fsl/imx-pcm-fiq.c
> @@ -338,7 +338,6 @@ static void snd_imx_pcm_free(struct snd_soc_component *component,
>  static const struct snd_soc_component_driver imx_soc_component_fiq = {
>  	.open		= snd_imx_open,
>  	.close		= snd_imx_close,
> -	.ioctl		= snd_soc_pcm_lib_ioctl,
>  	.hw_params	= snd_imx_pcm_hw_params,
>  	.prepare	= snd_imx_pcm_prepare,
>  	.trigger	= snd_imx_pcm_trigger,
> diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
> index 5237ac96b756..ed7211d744b3 100644
> --- a/sound/soc/fsl/mpc5200_dma.c
> +++ b/sound/soc/fsl/mpc5200_dma.c
> @@ -360,7 +360,6 @@ static const struct snd_soc_component_driver mpc5200_audio_dma_component = {
>  	.open		= psc_dma_open,
>  	.close		= psc_dma_close,
>  	.hw_free	= psc_dma_hw_free,
> -	.ioctl		= snd_soc_pcm_lib_ioctl,
>  	.pointer	= psc_dma_pointer,
>  	.trigger	= psc_dma_trigger,
>  	.hw_params	= psc_dma_hw_params,
> -- 
> 2.16.4
>

Patch
diff mbox series

diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
index d6146de9acd2..79d66224c0a8 100644
--- a/sound/soc/fsl/fsl_asrc_dma.c
+++ b/sound/soc/fsl/fsl_asrc_dma.c
@@ -428,7 +428,6 @@  static void fsl_asrc_dma_pcm_free(struct snd_soc_component *component,
 
 struct snd_soc_component_driver fsl_asrc_component = {
 	.name		= DRV_NAME,
-	.ioctl		= snd_soc_pcm_lib_ioctl,
 	.hw_params	= fsl_asrc_dma_hw_params,
 	.hw_free	= fsl_asrc_dma_hw_free,
 	.trigger	= fsl_asrc_dma_trigger,
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c
index 2868c4f97cb2..13ae089c1911 100644
--- a/sound/soc/fsl/fsl_dma.c
+++ b/sound/soc/fsl/fsl_dma.c
@@ -903,7 +903,6 @@  static int fsl_soc_dma_probe(struct platform_device *pdev)
 	dma->dai.name = DRV_NAME;
 	dma->dai.open = fsl_dma_open;
 	dma->dai.close = fsl_dma_close;
-	dma->dai.ioctl = snd_soc_pcm_lib_ioctl;
 	dma->dai.hw_params = fsl_dma_hw_params;
 	dma->dai.hw_free = fsl_dma_hw_free;
 	dma->dai.pointer = fsl_dma_pointer;
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 08131d147983..f20d5b1c3848 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -338,7 +338,6 @@  static void snd_imx_pcm_free(struct snd_soc_component *component,
 static const struct snd_soc_component_driver imx_soc_component_fiq = {
 	.open		= snd_imx_open,
 	.close		= snd_imx_close,
-	.ioctl		= snd_soc_pcm_lib_ioctl,
 	.hw_params	= snd_imx_pcm_hw_params,
 	.prepare	= snd_imx_pcm_prepare,
 	.trigger	= snd_imx_pcm_trigger,
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 5237ac96b756..ed7211d744b3 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -360,7 +360,6 @@  static const struct snd_soc_component_driver mpc5200_audio_dma_component = {
 	.open		= psc_dma_open,
 	.close		= psc_dma_close,
 	.hw_free	= psc_dma_hw_free,
-	.ioctl		= snd_soc_pcm_lib_ioctl,
 	.pointer	= psc_dma_pointer,
 	.trigger	= psc_dma_trigger,
 	.hw_params	= psc_dma_hw_params,