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

Message ID 20191210145406.21419-11-tiwai@suse.de
State Accepted
Commit a984e214de0c5d592a50bc6bd04b32a335d48a55
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: Jerome Brunet <jbrunet@baylibre.com>
Cc: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/meson/axg-frddr.c | 3 ---
 sound/soc/meson/axg-toddr.c | 3 ---
 2 files changed, 6 deletions(-)

Comments

Jerome Brunet Dec. 11, 2019, 9:45 a.m. UTC | #1
On Tue 10 Dec 2019 at 15:53, Takashi Iwai <tiwai@suse.de> wrote:

> ASoC PCM core deals the empty ioctl field now as default.
> Let's kill the redundant lines.
>
> Cc: Jerome Brunet <jbrunet@baylibre.com>

Acked-by: Jerome Brunet <jbrunet@baylibre.com>

> Cc: Kevin Hilman <khilman@baylibre.com>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>  sound/soc/meson/axg-frddr.c | 3 ---
>  sound/soc/meson/axg-toddr.c | 3 ---
>  2 files changed, 6 deletions(-)
>
> diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c
> index 665d75d49d7b..0a7d41257a38 100644
> --- a/sound/soc/meson/axg-frddr.c
> +++ b/sound/soc/meson/axg-frddr.c
> @@ -151,7 +151,6 @@ static const struct snd_soc_component_driver axg_frddr_component_drv = {
>  	.num_dapm_routes	= ARRAY_SIZE(axg_frddr_dapm_routes),
>  	.open			= axg_fifo_pcm_open,
>  	.close			= axg_fifo_pcm_close,
> -	.ioctl			= snd_soc_pcm_lib_ioctl,
>  	.hw_params		= axg_fifo_pcm_hw_params,
>  	.hw_free		= axg_fifo_pcm_hw_free,
>  	.pointer		= axg_fifo_pcm_pointer,
> @@ -275,7 +274,6 @@ static const struct snd_soc_component_driver g12a_frddr_component_drv = {
>  	.num_dapm_routes	= ARRAY_SIZE(g12a_frddr_dapm_routes),
>  	.open			= axg_fifo_pcm_open,
>  	.close			= axg_fifo_pcm_close,
> -	.ioctl			= snd_soc_pcm_lib_ioctl,
>  	.hw_params		= g12a_fifo_pcm_hw_params,
>  	.hw_free		= axg_fifo_pcm_hw_free,
>  	.pointer		= axg_fifo_pcm_pointer,
> @@ -345,7 +343,6 @@ static const struct snd_soc_component_driver sm1_frddr_component_drv = {
>  	.num_dapm_routes	= ARRAY_SIZE(g12a_frddr_dapm_routes),
>  	.open			= axg_fifo_pcm_open,
>  	.close			= axg_fifo_pcm_close,
> -	.ioctl			= snd_soc_pcm_lib_ioctl,
>  	.hw_params		= g12a_fifo_pcm_hw_params,
>  	.hw_free		= axg_fifo_pcm_hw_free,
>  	.pointer		= axg_fifo_pcm_pointer,
> diff --git a/sound/soc/meson/axg-toddr.c b/sound/soc/meson/axg-toddr.c
> index 7fef0b961496..f6023397c8fe 100644
> --- a/sound/soc/meson/axg-toddr.c
> +++ b/sound/soc/meson/axg-toddr.c
> @@ -183,7 +183,6 @@ static const struct snd_soc_component_driver axg_toddr_component_drv = {
>  	.num_dapm_routes	= ARRAY_SIZE(axg_toddr_dapm_routes),
>  	.open			= axg_fifo_pcm_open,
>  	.close			= axg_fifo_pcm_close,
> -	.ioctl			= snd_soc_pcm_lib_ioctl,
>  	.hw_params		= axg_fifo_pcm_hw_params,
>  	.hw_free		= axg_fifo_pcm_hw_free,
>  	.pointer		= axg_fifo_pcm_pointer,
> @@ -222,7 +221,6 @@ static const struct snd_soc_component_driver g12a_toddr_component_drv = {
>  	.num_dapm_routes	= ARRAY_SIZE(axg_toddr_dapm_routes),
>  	.open			= axg_fifo_pcm_open,
>  	.close			= axg_fifo_pcm_close,
> -	.ioctl			= snd_soc_pcm_lib_ioctl,
>  	.hw_params		= g12a_fifo_pcm_hw_params,
>  	.hw_free		= axg_fifo_pcm_hw_free,
>  	.pointer		= axg_fifo_pcm_pointer,
> @@ -292,7 +290,6 @@ static const struct snd_soc_component_driver sm1_toddr_component_drv = {
>  	.num_dapm_routes	= ARRAY_SIZE(sm1_toddr_dapm_routes),
>  	.open			= axg_fifo_pcm_open,
>  	.close			= axg_fifo_pcm_close,
> -	.ioctl			= snd_soc_pcm_lib_ioctl,
>  	.hw_params		= g12a_fifo_pcm_hw_params,
>  	.hw_free		= axg_fifo_pcm_hw_free,
>  	.pointer		= axg_fifo_pcm_pointer,

Patch
diff mbox series

diff --git a/sound/soc/meson/axg-frddr.c b/sound/soc/meson/axg-frddr.c
index 665d75d49d7b..0a7d41257a38 100644
--- a/sound/soc/meson/axg-frddr.c
+++ b/sound/soc/meson/axg-frddr.c
@@ -151,7 +151,6 @@  static const struct snd_soc_component_driver axg_frddr_component_drv = {
 	.num_dapm_routes	= ARRAY_SIZE(axg_frddr_dapm_routes),
 	.open			= axg_fifo_pcm_open,
 	.close			= axg_fifo_pcm_close,
-	.ioctl			= snd_soc_pcm_lib_ioctl,
 	.hw_params		= axg_fifo_pcm_hw_params,
 	.hw_free		= axg_fifo_pcm_hw_free,
 	.pointer		= axg_fifo_pcm_pointer,
@@ -275,7 +274,6 @@  static const struct snd_soc_component_driver g12a_frddr_component_drv = {
 	.num_dapm_routes	= ARRAY_SIZE(g12a_frddr_dapm_routes),
 	.open			= axg_fifo_pcm_open,
 	.close			= axg_fifo_pcm_close,
-	.ioctl			= snd_soc_pcm_lib_ioctl,
 	.hw_params		= g12a_fifo_pcm_hw_params,
 	.hw_free		= axg_fifo_pcm_hw_free,
 	.pointer		= axg_fifo_pcm_pointer,
@@ -345,7 +343,6 @@  static const struct snd_soc_component_driver sm1_frddr_component_drv = {
 	.num_dapm_routes	= ARRAY_SIZE(g12a_frddr_dapm_routes),
 	.open			= axg_fifo_pcm_open,
 	.close			= axg_fifo_pcm_close,
-	.ioctl			= snd_soc_pcm_lib_ioctl,
 	.hw_params		= g12a_fifo_pcm_hw_params,
 	.hw_free		= axg_fifo_pcm_hw_free,
 	.pointer		= axg_fifo_pcm_pointer,
diff --git a/sound/soc/meson/axg-toddr.c b/sound/soc/meson/axg-toddr.c
index 7fef0b961496..f6023397c8fe 100644
--- a/sound/soc/meson/axg-toddr.c
+++ b/sound/soc/meson/axg-toddr.c
@@ -183,7 +183,6 @@  static const struct snd_soc_component_driver axg_toddr_component_drv = {
 	.num_dapm_routes	= ARRAY_SIZE(axg_toddr_dapm_routes),
 	.open			= axg_fifo_pcm_open,
 	.close			= axg_fifo_pcm_close,
-	.ioctl			= snd_soc_pcm_lib_ioctl,
 	.hw_params		= axg_fifo_pcm_hw_params,
 	.hw_free		= axg_fifo_pcm_hw_free,
 	.pointer		= axg_fifo_pcm_pointer,
@@ -222,7 +221,6 @@  static const struct snd_soc_component_driver g12a_toddr_component_drv = {
 	.num_dapm_routes	= ARRAY_SIZE(axg_toddr_dapm_routes),
 	.open			= axg_fifo_pcm_open,
 	.close			= axg_fifo_pcm_close,
-	.ioctl			= snd_soc_pcm_lib_ioctl,
 	.hw_params		= g12a_fifo_pcm_hw_params,
 	.hw_free		= axg_fifo_pcm_hw_free,
 	.pointer		= axg_fifo_pcm_pointer,
@@ -292,7 +290,6 @@  static const struct snd_soc_component_driver sm1_toddr_component_drv = {
 	.num_dapm_routes	= ARRAY_SIZE(sm1_toddr_dapm_routes),
 	.open			= axg_fifo_pcm_open,
 	.close			= axg_fifo_pcm_close,
-	.ioctl			= snd_soc_pcm_lib_ioctl,
 	.hw_params		= g12a_fifo_pcm_hw_params,
 	.hw_free		= axg_fifo_pcm_hw_free,
 	.pointer		= axg_fifo_pcm_pointer,