ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command (e11f0f90) · Commits · 戴 / test

Drivers can implement 'struct snd_pcm_ops.ioctl' to handle some requests from ALSA PCM core. These requests are internal purpose in kernel land. Usually common set of operations are used for it. SNDRV_PCM_IOCTL1_INFO is one of the requests. According to code comment, it has been obsoleted in the old days. We can see old releases in ftp.alsa-project.org. The command was firstly introduced in v0.5.0 release as SND_PCM_IOCTL1_INFO, to allow drivers to fill data of 'struct snd_pcm_channel_info' type. In v0.9.0 release, this was obsoleted by the other commands for ioctl(2) such as SNDRV_PCM_IOCTL_CHANNEL_INFO. This commit removes the long-abandoned command, bye. Signed-off-by:

Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by:

Takashi Iwai <tiwai@suse.de>

include/sound/pcm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@ struct snd_pcm_ops {
		#endif

		#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
		@@ -1787,8 +1787,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
		@@ -212,11 +212,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;
		}

Admin message