Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa84cf09 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm: Nuke snd_pcm_lib_mmap_vmalloc() 



snd_pcm_lib_mmap_vmalloc() was supposed to be implemented with
somewhat special for vmalloc handling, but in the end, this turned to
just the default handler, i.e. NULL.  As the situation has never
changed over decades, let's rip it off.

Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ef4db239

drivers/staging/most/sound/sound.c

+0 −1
Original line number Diff line number Diff line
@@ -457,7 +457,6 @@ static const struct snd_pcm_ops pcm_ops = { 
	.trigger    = pcm_trigger,

	.pointer    = pcm_pointer,

	.page       = snd_pcm_lib_get_vmalloc_page,

	.mmap       = snd_pcm_lib_mmap_vmalloc,

};



static int split_arg_list(char *buf, char **card_name, u16 *ch_num,

include/sound/pcm.h

+0 −2
Original line number Diff line number Diff line
@@ -1342,8 +1342,6 @@ int snd_pcm_lib_mmap_iomem(struct snd_pcm_substream *substream, struct vm_area_s 
#define snd_pcm_lib_mmap_iomem	NULL

#endif



#define snd_pcm_lib_mmap_vmalloc NULL



/**

 * snd_pcm_limit_isa_dma_size - Get the max size fitting with ISA DMA transfer

 * @dma: DMA number

sound/drivers/aloop.c

+0 −1
Original line number Diff line number Diff line
@@ -778,7 +778,6 @@ static const struct snd_pcm_ops loopback_pcm_ops = { 
	.trigger =	loopback_trigger,

	.pointer =	loopback_pointer,

	.page =		snd_pcm_lib_get_vmalloc_page,

	.mmap =		snd_pcm_lib_mmap_vmalloc,

};



static int loopback_pcm_new(struct loopback *loopback,

sound/drivers/vx/vx_pcm.c

+0 −2
Original line number Diff line number Diff line
@@ -883,7 +883,6 @@ static const struct snd_pcm_ops vx_pcm_playback_ops = { 
	.trigger =	vx_pcm_trigger,

	.pointer =	vx_pcm_playback_pointer,

	.page =		snd_pcm_lib_get_vmalloc_page,

	.mmap =		snd_pcm_lib_mmap_vmalloc,

};
@@ -1105,7 +1104,6 @@ static const struct snd_pcm_ops vx_pcm_capture_ops = { 
	.trigger =	vx_pcm_trigger,

	.pointer =	vx_pcm_capture_pointer,

	.page =		snd_pcm_lib_get_vmalloc_page,

	.mmap =		snd_pcm_lib_mmap_vmalloc,

};

sound/firewire/bebob/bebob_pcm.c

+0 −1
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ int snd_bebob_create_pcm_devices(struct snd_bebob *bebob) 
		.pointer	= pcm_playback_pointer,

		.ack		= pcm_playback_ack,

		.page		= snd_pcm_lib_get_vmalloc_page,

		.mmap		= snd_pcm_lib_mmap_vmalloc,

	};

	struct snd_pcm *pcm;

	int err;