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

Message ID 20191210145406.21419-15-tiwai@suse.de
State Accepted
Commit e91f134c83b1b3319db4c14bb5d9d23dc567b283
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.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/sh/dma-sh7760.c | 1 -
 sound/soc/sh/fsi.c        | 1 -
 sound/soc/sh/rcar/core.c  | 1 -
 sound/soc/sh/siu_pcm.c    | 1 -
 4 files changed, 4 deletions(-)

Comments

Mark Brown Dec. 11, 2019, 4:34 p.m. UTC | #1
On Tue, Dec 10, 2019 at 03:53:57PM +0100, Takashi Iwai wrote:
> ASoC PCM core deals the empty ioctl field now as default.
> Let's kill the redundant lines.

This doesn't apply against current code.
Takashi Iwai Dec. 11, 2019, 4:51 p.m. UTC | #2
On Wed, 11 Dec 2019 17:34:18 +0100,
Mark Brown wrote:
> 
> On Tue, Dec 10, 2019 at 03:53:57PM +0100, Takashi Iwai wrote:
> > ASoC PCM core deals the empty ioctl field now as default.
> > Let's kill the redundant lines.
> 
> This doesn't apply against current code.

Sigh, I had to wait rc1 release so that everything can get synced for
this kind of large API changes, and then one day after the window
close, it's already too late... :-<

OK, will submit all patches again.  But at the next time I won't split
to two series but in a single queue.  Be prepared.


Takashi
Mark Brown Dec. 11, 2019, 4:57 p.m. UTC | #3
On Wed, Dec 11, 2019 at 05:51:57PM +0100, Takashi Iwai wrote:

> Sigh, I had to wait rc1 release so that everything can get synced for
> this kind of large API changes, and then one day after the window
> close, it's already too late... :-<

People send stuff through the merge window, and if everyone waits for
the end before submitting you end up with conflicts still.

> OK, will submit all patches again.  But at the next time I won't split
> to two series but in a single queue.  Be prepared.

I've applied most of it - there's only a couple that didn't end up
applying at all (IIRC these ones actually got fixed up).
Takashi Iwai Dec. 11, 2019, 5:04 p.m. UTC | #4
On Wed, 11 Dec 2019 17:57:38 +0100,
Mark Brown wrote:
> 
> On Wed, Dec 11, 2019 at 05:51:57PM +0100, Takashi Iwai wrote:
> 
> > Sigh, I had to wait rc1 release so that everything can get synced for
> > this kind of large API changes, and then one day after the window
> > close, it's already too late... :-<
> 
> People send stuff through the merge window, and if everyone waits for
> the end before submitting you end up with conflicts still.

Yeah, that's a bad habit that people can't wait.

The submission for the next kernel during the merge window isn't
acceptable for many other subsystems, so I had to wait until rc1
release.

> > OK, will submit all patches again.  But at the next time I won't split
> > to two series but in a single queue.  Be prepared.
> 
> I've applied most of it - there's only a couple that didn't end up
> applying at all (IIRC these ones actually got fixed up).

OK, could you give the list of missing patches, so that I don't
overlook anything?


thanks,

Takashi
Mark Brown Dec. 11, 2019, 5:10 p.m. UTC | #5
On Wed, Dec 11, 2019 at 06:04:31PM +0100, Takashi Iwai wrote:
> Mark Brown wrote:

> > People send stuff through the merge window, and if everyone waits for
> > the end before submitting you end up with conflicts still.

> Yeah, that's a bad habit that people can't wait.

> The submission for the next kernel during the merge window isn't
> acceptable for many other subsystems, so I had to wait until rc1
> release.

It doesn't really make much difference from my point of view, I just
queue stuff up to apply once -rc1 comes out.

> > I've applied most of it - there's only a couple that didn't end up
> > applying at all (IIRC these ones actually got fixed up).

> OK, could you give the list of missing patches, so that I don't
> overlook anything?

Should just be:

ASoC: mediatek: Use managed buffer allocation
ASoC: SOF: Use managed buffer allocation
Takashi Iwai Dec. 11, 2019, 5:13 p.m. UTC | #6
On Wed, 11 Dec 2019 18:10:06 +0100,
Mark Brown wrote:
> 
> On Wed, Dec 11, 2019 at 06:04:31PM +0100, Takashi Iwai wrote:
> > Mark Brown wrote:
> 
> > > People send stuff through the merge window, and if everyone waits for
> > > the end before submitting you end up with conflicts still.
> 
> > Yeah, that's a bad habit that people can't wait.
> 
> > The submission for the next kernel during the merge window isn't
> > acceptable for many other subsystems, so I had to wait until rc1
> > release.
> 
> It doesn't really make much difference from my point of view, I just
> queue stuff up to apply once -rc1 comes out.

Yeah I know now it's fine for you, but what I meant is that many other
subsystems don't want to *receive* patches during the merge window
(not about the actual merge).

So I postponed the submission of the whole series until the window
gets closed at this time.

> > > I've applied most of it - there's only a couple that didn't end up
> > > applying at all (IIRC these ones actually got fixed up).
> 
> > OK, could you give the list of missing patches, so that I don't
> > overlook anything?
> 
> Should just be:
> 
> ASoC: mediatek: Use managed buffer allocation
> ASoC: SOF: Use managed buffer allocation

OK, will submit soon later.


thanks,

Takashi

Patch
diff mbox series

diff --git a/sound/soc/sh/dma-sh7760.c b/sound/soc/sh/dma-sh7760.c
index 4d0f2f738ffa..eee1a1e994cb 100644
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@@ -307,7 +307,6 @@  static int camelot_pcm_new(struct snd_soc_component *component,
 static const struct snd_soc_component_driver sh7760_soc_component = {
 	.open		= camelot_pcm_open,
 	.close		= camelot_pcm_close,
-	.ioctl		= snd_soc_pcm_lib_ioctl,
 	.hw_params	= camelot_hw_params,
 	.prepare	= camelot_prepare,
 	.trigger	= camelot_trigger,
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 1cebddd76d12..89119acfa911 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -1801,7 +1801,6 @@  static struct snd_soc_dai_driver fsi_soc_dai[] = {
 static const struct snd_soc_component_driver fsi_soc_component = {
 	.name		= "fsi",
 	.open		= fsi_pcm_open,
-	.ioctl		= snd_soc_pcm_lib_ioctl,
 	.pointer	= fsi_pointer,
 	.pcm_construct	= fsi_pcm_new,
 };
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index bb840be5e591..614216d5a68b 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1657,7 +1657,6 @@  int rsnd_kctrl_new(struct rsnd_mod *mod,
  */
 static const struct snd_soc_component_driver rsnd_soc_component = {
 	.name		= "rsnd",
-	.ioctl		= snd_soc_pcm_lib_ioctl,
 	.hw_params	= rsnd_hw_params,
 	.hw_free	= rsnd_hw_free,
 	.pointer	= rsnd_pointer,
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 65637ad93630..6a6ffd6d3192 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -548,7 +548,6 @@  struct const snd_soc_component_driver siu_component = {
 	.name		= DRV_NAME,
 	.open		= siu_pcm_open,
 	.close		= siu_pcm_close,
-	.ioctl		= snd_soc_pcm_lib_ioctl,
 	.prepare	= siu_pcm_prepare,
 	.trigger	= siu_pcm_trigger,
 	.pointer	= siu_pcm_pointer_dma,