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

Commit d624c683 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 unused variable from snd_pcm_info()"

parents c730b870 3e2b8890

include/sound/pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,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
@@ -1857,8 +1857,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 −7
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ static inline void snd_leave_user(mm_segment_t fs) 


int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info)

{

	struct snd_pcm_runtime *runtime;

	struct snd_pcm *pcm = substream->pcm;

	struct snd_pcm_str *pstr = substream->pstr;
@@ -213,12 +212,7 @@ int snd_pcm_info(struct snd_pcm_substream *substream, struct snd_pcm_info *info) 
	info->subdevices_count = pstr->substream_count;

	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;

}