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

Commit 8420459f authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Greg Kroah-Hartman
Browse files

ALSA: pcm: remove SNDRV_PCM_IOCTL1_INFO internal command 



commit e11f0f90a626f93899687b1cc909ee37dd6c5809 upstream.

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: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarBen Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f0324fb

include/sound/pcm.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,7 @@ struct snd_pcm_ops { 
#endif

#endif





#define SNDRV_PCM_IOCTL1_RESET		0

#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_CHANNEL_INFO	2

#define SNDRV_PCM_IOCTL1_GSTATE		3

#define SNDRV_PCM_IOCTL1_GSTATE		3

#define SNDRV_PCM_IOCTL1_FIFO_SIZE	4

#define SNDRV_PCM_IOCTL1_FIFO_SIZE	4

sound/core/pcm_lib.c

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

		      unsigned int cmd, void *arg)

{

{

	switch (cmd) {

	switch (cmd) {

	case SNDRV_PCM_IOCTL1_INFO:

		return 0;

	case SNDRV_PCM_IOCTL1_RESET:

	case SNDRV_PCM_IOCTL1_RESET:

		return snd_pcm_lib_ioctl_reset(substream, arg);

		return snd_pcm_lib_ioctl_reset(substream, arg);

	case SNDRV_PCM_IOCTL1_CHANNEL_INFO:

	case SNDRV_PCM_IOCTL1_CHANNEL_INFO:

sound/core/pcm_native.c

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

	info->subdevices_avail = pstr->substream_count - pstr->substream_opened;

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

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

	runtime = substream->runtime;

	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;

	return 0;

}

}