tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: SoC: core: Introduce macro SOC_SINGLE_MULTI_EXT"

Browse Source 
This reverts commit 4233dfd7c0.

This change added some code that exported a symbol but it was not used
and never upstream and nothing has happened with it in 6 years, so it
should be removed from the tree instead.

If it really is needed, it should be submitted upstream properly.

Bug: 144610828
Cc: Banajit Goswami <bgoswami@codeaurora.org>
Cc: Sudheer Papothi <spapothi@codeaurora.org>
Cc: Meng Wang <mwang@codeaurora.org>
Cc: Lee Jones <joneslee@google.com>
Change-Id: I0f7d425f0e159f03ef427ea2b45916f0e6ee30e0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-12-13 15:14:22 +00:00
parent 4aafd1aff5
commit 5d88b26cbb
2 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sound/soc.h
-15
View File
@@ -253,14 +253,6 @@
.get = xhandler_get, .put = xhandler_put, \
.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
xmax, xinvert) }
#define SOC_SINGLE_MULTI_EXT(xname, xreg, xshift, xmax, xinvert, xcount,\
xhandler_get, xhandler_put) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
.info = snd_soc_info_multi_ext, \
.get = xhandler_get, .put = xhandler_put, \
.private_value = (unsigned long)&(struct soc_multi_mixer_control) \
{.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \
.count = xcount, .platform_max = xmax, .invert = xinvert} }
#define SOC_SINGLE_EXT_TLV(xname, xreg, xshift, xmax, xinvert,\
xhandler_get, xhandler_put, tlv_array) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -614,8 +606,6 @@ int snd_soc_get_strobe(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
int snd_soc_put_strobe(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
int snd_soc_info_multi_ext(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo);
enum snd_soc_trigger_order {
/* start stop */
@@ -1204,11 +1194,6 @@ struct soc_mreg_control {
unsigned int regbase, regcount, nbits, invert;
};
struct soc_multi_mixer_control {
int min, max, platform_max, count;
unsigned int reg, rreg, shift, rshift, invert;
};
/* enumerated kcontrol */
struct soc_enum {
int reg;
sound/soc/soc-core.c
-33
View File
@@ -3366,39 +3366,6 @@ int snd_soc_get_dai_id(struct device_node *ep)
}
EXPORT_SYMBOL_GPL(snd_soc_get_dai_id);
/**
* snd_soc_info_multi_ext - external single mixer info callback
* @kcontrol: mixer control
* @uinfo: control element information
*
* Callback to provide information about a single external mixer control.
* that accepts multiple input.
*
* Returns 0 for success.
*/
int snd_soc_info_multi_ext(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{
struct soc_multi_mixer_control *mc =
(struct soc_multi_mixer_control *)kcontrol->private_value;
int platform_max;
if (!mc->platform_max)
mc->platform_max = mc->max;
platform_max = mc->platform_max;
if (platform_max == 1 && !strnstr(kcontrol->id.name, " Volume", 30))
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
else
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = mc->count;
uinfo->value.integer.min = 0;
uinfo->value.integer.max = platform_max;
return 0;
}
EXPORT_SYMBOL_GPL(snd_soc_info_multi_ext);
int snd_soc_get_dlc(const struct of_phandle_args *args, struct snd_soc_dai_link_component *dlc)
{
struct snd_soc_component *pos;