| Message ID | 20191108164214.611-1-tiwai@suse.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 67b2945d632328fa0245279e8281e34bf1c78ae2 |
| Headers | show |
| Series | usb: gadget: u_audio: Remove superfluous snd_dma_continuous_data() | expand |
On Fri, Nov 08, 2019 at 05:42:14PM +0100, 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> > > --- > > Note that the prerequisite commit 08422d2c559d is found currently only > on for-next branch of sound git tree, so please give ACK if it's OK, > so that I can apply on top of it. Thanks! Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index 56906d15fb55..7ec6a996af26 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -585,7 +585,7 @@ int g_audio_setup(struct g_audio *g_audio, const char *pcm_name, sprintf(card->longname, "%s %i", card_name, card->dev->id); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, - snd_dma_continuous_data(GFP_KERNEL), 0, BUFF_SIZE_MAX); + NULL, 0, BUFF_SIZE_MAX); err = snd_card_register(card);
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> --- Note that the prerequisite commit 08422d2c559d is found currently only on for-next branch of sound git tree, so please give ACK if it's OK, so that I can apply on top of it. Thanks! drivers/usb/gadget/function/u_audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)