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

Commit 6f6c6e07 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command"

parents e0cf17f7 f6fa478b

include/sound/pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ struct snd_pcm_ops { 
#define SNDRV_PCM_IOCTL1_TRUE		((void *)1)



#define SNDRV_PCM_IOCTL1_RESET		0

#define SNDRV_PCM_IOCTL1_INFO		1

/* 1 is absent slot. */

#define SNDRV_PCM_IOCTL1_CHANNEL_INFO	2

#define SNDRV_PCM_IOCTL1_GSTATE		3

#define SNDRV_PCM_IOCTL1_FIFO_SIZE	4

sound/core/pcm_lib.c

+0 −2
Original line number Diff line number Diff line
@@ -1832,8 +1832,6 @@ int snd_pcm_lib_ioctl(struct snd_pcm_substream *substream, 
		      unsigned int cmd, void *arg)

{

	switch (cmd) {

	case SNDRV_PCM_IOCTL1_INFO:

		return 0;

	case SNDRV_PCM_IOCTL1_RESET:

		return snd_pcm_lib_ioctl_reset(substream, arg);

	case SNDRV_PCM_IOCTL1_CHANNEL_INFO:

sound/core/pcm_native.c

+1 −5
Original line number Diff line number Diff line
@@ -217,11 +217,7 @@ int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info) 
	info->subdevices_avail = pstr->substream_count - pstr->substream_opened;

	strlcpy(info->subname, substream->name, sizeof(info->subname));

	runtime = substream->runtime;

	/* AB: FIXME!!! This is definitely nonsense */

	if (runtime) {

		info->sync = runtime->sync;

		substream->ops->ioctl(substream, SNDRV_PCM_IOCTL1_INFO, info);

	}



	return 0;

}