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

Commit 8e47f98c authored by Meng Wang's avatar Meng Wang Committed by Gerrit - the friendly Code Review server
Browse files

Revert "ALSA: PCM: User control API implementation" 



This reverts commit 8625c90a.
This change has been moved out of ASoC.

Change-Id: Ifc18eed2e21925f6edcf746902e1fe22a58774a4
Signed-off-by: default avatarMeng Wang <mengw@codeaurora.org>
parent e1bdeb41

include/sound/pcm.h

+1 −26
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ struct snd_pcm_str { 
	struct snd_kcontrol *chmap_kctl; /* channel-mapping controls */

#ifdef CONFIG_AUDIO_QGKI

	struct snd_kcontrol *vol_kctl; /* volume controls */

	struct snd_kcontrol *usr_kctl; /* user controls */

#endif

	struct device dev;

};
@@ -1433,7 +1432,6 @@ static inline u64 pcm_format_to_bits(snd_pcm_format_t pcm_format) 


#ifdef CONFIG_AUDIO_QGKI

#define SND_PCM_ADD_VOLUME_CTL 1

#define SND_PCM_ADD_USR_CTL 1

/*

 * PCM Volume control API

 */
@@ -1457,31 +1455,8 @@ int snd_pcm_add_volume_ctls(struct snd_pcm *pcm, int stream, 
			   int max_length,

			   unsigned long private_value,

			   struct snd_pcm_volume **info_ret);



/*

 * PCM User control API

 */

/* array element of usr elem */

struct snd_pcm_usr_elem {

	int val[128];

};



/* pp information; retrieved via snd_kcontrol_chip() */

struct snd_pcm_usr {

	struct snd_pcm *pcm;	/* assigned PCM instance */

	int stream;		/* PLAYBACK or CAPTURE */

	struct snd_kcontrol *kctl;

	const struct snd_pcm_usr_elem *usr;

	int max_length;

	void *private_data;	/* optional: private data pointer */

};



int snd_pcm_add_usr_ctls(struct snd_pcm *pcm, int stream,

			 const struct snd_pcm_usr_elem *usr,

			 int max_length, int max_control_str_len,

			 unsigned long private_value,

			 struct snd_pcm_usr **info_ret);

#endif



/* printk helpers */

#define pcm_err(pcm, fmt, args...) \

	dev_err((pcm)->card->dev, fmt, ##args)

sound/core/pcm.c

+0 −4
Original line number Diff line number Diff line
@@ -821,10 +821,6 @@ static void free_chmap(struct snd_pcm_str *pstr) 
		snd_ctl_remove(pstr->pcm->card, pstr->vol_kctl);

		pstr->vol_kctl = NULL;

	}

	if (pstr->usr_kctl) {

		snd_ctl_remove(pstr->pcm->card, pstr->usr_kctl);

		pstr->usr_kctl = NULL;

	}

#endif

}

sound/core/pcm_lib.c

+0 −93
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#ifdef CONFIG_AUDIO_QGKI

#define STRING_LENGTH_OF_INT 12

#define MAX_USR_CTRL_CNT 128

#endif



static int fill_silence_frames(struct snd_pcm_substream *substream,
@@ -2565,96 +2564,4 @@ int snd_pcm_add_volume_ctls(struct snd_pcm *pcm, int stream, 
	return 0;

}

EXPORT_SYMBOL(snd_pcm_add_volume_ctls);



static int pcm_usr_ctl_info(struct snd_kcontrol *kcontrol,

			    struct snd_ctl_elem_info *uinfo)

{

	uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;

	uinfo->count = MAX_USR_CTRL_CNT;

	uinfo->value.integer.min = 0;

	uinfo->value.integer.max = INT_MAX;

	return 0;

}



static void pcm_usr_ctl_private_free(struct snd_kcontrol *kcontrol)

{

	struct snd_pcm_usr *info = snd_kcontrol_chip(kcontrol);



	info->pcm->streams[info->stream].usr_kctl = NULL;

	kfree(info);

}



/**

 * snd_pcm_add_usr_ctls - create user control elements

 * @pcm: the assigned PCM instance

 * @stream: stream direction

 * @max_length: the max length of the user parameter of stream

 * @private_value: the value passed to each kcontrol's private_value field

 * @info_ret: store struct snd_pcm_usr instance if non-NULL

 *

 * Create usr control elements assigned to the given PCM stream(s).

 * Returns zero if succeed, or a negative error value.

 */

int snd_pcm_add_usr_ctls(struct snd_pcm *pcm, int stream,

			 const struct snd_pcm_usr_elem *usr,

			 int max_length, int max_kctrl_str_len,

			 unsigned long private_value,

			 struct snd_pcm_usr **info_ret)

{

	struct snd_pcm_usr *info;

	struct snd_kcontrol_new knew = {

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,

		.info = pcm_usr_ctl_info,

	};

	int err;

	char *buf;



	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;



	info->pcm = pcm;

	info->stream = stream;

	info->usr = usr;

	info->max_length = max_length;

	buf = kzalloc(max_kctrl_str_len, GFP_KERNEL);

	if (!buf) {

		pr_err("%s: buffer allocation failed\n", __func__);

		kfree(info);

		return -ENOMEM;

	}

	knew.name = buf;

	if (stream == SNDRV_PCM_STREAM_PLAYBACK)

		snprintf(buf, max_kctrl_str_len, "%s %d %s",

			"Playback", pcm->device, "User kcontrol");

	else

		snprintf(buf, max_kctrl_str_len, "%s %d %s",

			"Capture", pcm->device, "User kcontrol");

	knew.device = pcm->device;

	knew.count = pcm->streams[stream].substream_count;

	knew.private_value = private_value;

	info->kctl = snd_ctl_new1(&knew, info);

	if (!info->kctl) {

		kfree(info);

		kfree(knew.name);

		pr_err("%s: snd_ctl_new failed\n", __func__);

		return -ENOMEM;

	}

	info->kctl->private_free = pcm_usr_ctl_private_free;

	err = snd_ctl_add(pcm->card, info->kctl);

	if (err < 0) {

		kfree(info);

		kfree(knew.name);

		pr_err("%s: snd_ctl_add failed:%d\n", __func__,

			err);

		return -ENOMEM;

	}

	pcm->streams[stream].usr_kctl = info->kctl;

	if (info_ret)

		*info_ret = info;

	kfree(knew.name);

	return 0;

}

EXPORT_SYMBOL(snd_pcm_add_usr_ctls);

#endif