[PATCH 0/2] media: ALSA memalloc cleanups

[PATCH 0/2] media: ALSA memalloc cleanups

[Takashi Iwai]

Hi,

this is a couple of cleanups for media subsystem wrt ALSA memory
allocation API usages.  It's based on the recent API changes that are
found in for-next of my sound git tree for 5.5 kernel, hence these
patches need to be applied on top of it.

So, just give me ACK if they are OK, so that I can apply them.


thanks,

Takashi

===

Takashi Iwai (2):
  media: solo6x10: Remove superfluous snd_dma_continuous_data()
  media: tw686x: audio: Avoid non-standard macro usage

 drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +-
 drivers/media/pci/tw686x/tw686x-audio.c    | 2 +-
 drivers/media/usb/usbtv/usbtv-audio.c      | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

-- 
2.16.4

[PATCH 1/2] media: solo6x10: Remove superfluous snd_dma_continuous_data()

[Takashi Iwai]

The recent change (commit 08422d2c559d: "ALSA: memalloc: Allow NULL
device for SNDRV_DMA_TYPE_CONTINOUS type") made the PCM preallocation
helper accepting NULL as the device pointer for the default usage.
Drop the snd_dma_continuous_data() usage that became superfluous from
the callers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +-
 drivers/media/usb/usbtv/usbtv-audio.c      | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
index 30c8f2ec9c3c..eaa57d835ea8 100644
--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
@@ -353,7 +353,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
 
 	snd_pcm_lib_preallocate_pages_for_all(pcm,
 					SNDRV_DMA_TYPE_CONTINUOUS,
-					snd_dma_continuous_data(GFP_KERNEL),
+					NULL,
 					G723_PERIOD_BYTES * PERIODS,
 					G723_PERIOD_BYTES * PERIODS);
 
diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c
index 6f108996142d..e746c8ddfc49 100644
--- a/drivers/media/usb/usbtv/usbtv-audio.c
+++ b/drivers/media/usb/usbtv/usbtv-audio.c
@@ -378,8 +378,7 @@ int usbtv_audio_init(struct usbtv *usbtv)
 
 	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usbtv_pcm_ops);
 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
-		snd_dma_continuous_data(GFP_KERNEL), USBTV_AUDIO_BUFFER,
-		USBTV_AUDIO_BUFFER);
+		NULL, USBTV_AUDIO_BUFFER, USBTV_AUDIO_BUFFER);
 
 	rv = snd_card_register(card);
 	if (rv)
-- 
2.16.4

[PATCH 2/2] media: tw686x: audio: Avoid non-standard macro usage

[Takashi Iwai]

Pass the device pointer from the PCI pointer directly, instead of a
non-standard macro.  The macro didn't give any better readability.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 drivers/media/pci/tw686x/tw686x-audio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/pci/tw686x/tw686x-audio.c b/drivers/media/pci/tw686x/tw686x-audio.c
index 40373bd23381..7786e51d19ae 100644
--- a/drivers/media/pci/tw686x/tw686x-audio.c
+++ b/drivers/media/pci/tw686x/tw686x-audio.c
@@ -300,7 +300,7 @@ static int tw686x_snd_pcm_init(struct tw686x_dev *dev)
 
 	snd_pcm_lib_preallocate_pages_for_all(pcm,
 				SNDRV_DMA_TYPE_DEV,
-				snd_dma_pci_data(dev->pci_dev),
+				&dev->pci_dev->dev,
 				TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX,
 				TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX);
 	return 0;
-- 
2.16.4

Re: [PATCH 1/2] media: solo6x10: Remove superfluous snd_dma_continuous_data()

[Hans Verkuil]

On 11/8/19 5:36 PM, Takashi Iwai wrote:
> The recent change (commit 08422d2c559d: "ALSA: memalloc: Allow NULL
> device for SNDRV_DMA_TYPE_CONTINOUS type") made the PCM preallocation
> helper accepting NULL as the device pointer for the default usage.
> Drop the snd_dma_continuous_data() usage that became superfluous from
> the callers.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Thanks!

	Hans

> ---
>  drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +-
>  drivers/media/usb/usbtv/usbtv-audio.c      | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
> index 30c8f2ec9c3c..eaa57d835ea8 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-g723.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
> @@ -353,7 +353,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
>  
>  	snd_pcm_lib_preallocate_pages_for_all(pcm,
>  					SNDRV_DMA_TYPE_CONTINUOUS,
> -					snd_dma_continuous_data(GFP_KERNEL),
> +					NULL,
>  					G723_PERIOD_BYTES * PERIODS,
>  					G723_PERIOD_BYTES * PERIODS);
>  
> diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c
> index 6f108996142d..e746c8ddfc49 100644
> --- a/drivers/media/usb/usbtv/usbtv-audio.c
> +++ b/drivers/media/usb/usbtv/usbtv-audio.c
> @@ -378,8 +378,7 @@ int usbtv_audio_init(struct usbtv *usbtv)
>  
>  	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_usbtv_pcm_ops);
>  	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
> -		snd_dma_continuous_data(GFP_KERNEL), USBTV_AUDIO_BUFFER,
> -		USBTV_AUDIO_BUFFER);
> +		NULL, USBTV_AUDIO_BUFFER, USBTV_AUDIO_BUFFER);
>  
>  	rv = snd_card_register(card);
>  	if (rv)
> 

Re: [PATCH 2/2] media: tw686x: audio: Avoid non-standard macro usage

[Hans Verkuil]

On 11/8/19 5:36 PM, Takashi Iwai wrote:
> Pass the device pointer from the PCI pointer directly, instead of a
> non-standard macro.  The macro didn't give any better readability.
> 
> Signed-off-by: Takashi Iwai <tiwai@suse.de>

Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Thanks!

	Hans

> ---
>  drivers/media/pci/tw686x/tw686x-audio.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/pci/tw686x/tw686x-audio.c b/drivers/media/pci/tw686x/tw686x-audio.c
> index 40373bd23381..7786e51d19ae 100644
> --- a/drivers/media/pci/tw686x/tw686x-audio.c
> +++ b/drivers/media/pci/tw686x/tw686x-audio.c
> @@ -300,7 +300,7 @@ static int tw686x_snd_pcm_init(struct tw686x_dev *dev)
>  
>  	snd_pcm_lib_preallocate_pages_for_all(pcm,
>  				SNDRV_DMA_TYPE_DEV,
> -				snd_dma_pci_data(dev->pci_dev),
> +				&dev->pci_dev->dev,
>  				TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX,
>  				TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX);
>  	return 0;
> 

Re: [PATCH 0/2] media: ALSA memalloc cleanups

[Hans Verkuil]

On 11/8/19 5:36 PM, Takashi Iwai wrote:
> Hi,
> 
> this is a couple of cleanups for media subsystem wrt ALSA memory
> allocation API usages.  It's based on the recent API changes that are
> found in for-next of my sound git tree for 5.5 kernel, hence these
> patches need to be applied on top of it.
> 
> So, just give me ACK if they are OK, so that I can apply them.

I Acked them. Mauro is very busy so you'll have to do with my Ack,
and anyway I maintain those drivers.

Regards,

	Hans

> 
> 
> thanks,
> 
> Takashi
> 
> ===
> 
> Takashi Iwai (2):
>   media: solo6x10: Remove superfluous snd_dma_continuous_data()
>   media: tw686x: audio: Avoid non-standard macro usage
> 
>  drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +-
>  drivers/media/pci/tw686x/tw686x-audio.c    | 2 +-
>  drivers/media/usb/usbtv/usbtv-audio.c      | 3 +--
>  3 files changed, 3 insertions(+), 4 deletions(-)
> 

Re: [PATCH 0/2] media: ALSA memalloc cleanups

[Takashi Iwai]

On Sun, 10 Nov 2019 11:05:53 +0100,
Hans Verkuil wrote:
> 
> On 11/8/19 5:36 PM, Takashi Iwai wrote:
> > Hi,
> > 
> > this is a couple of cleanups for media subsystem wrt ALSA memory
> > allocation API usages.  It's based on the recent API changes that are
> > found in for-next of my sound git tree for 5.5 kernel, hence these
> > patches need to be applied on top of it.
> > 
> > So, just give me ACK if they are OK, so that I can apply them.
> 
> I Acked them. Mauro is very busy so you'll have to do with my Ack,
> and anyway I maintain those drivers.

OK, thanks!  I queued these fixed now.


Takashi