UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: pxa: Make static string arrays 'const 'char * const []' 

const char * const [] is the preferred type for static string arrays since
this states explicitly that the individual entries are not going to be
changed. Due to limitations in the ASoC API it was not possible to use it
for enum text arrays. Commit 87023ff74 ('ASoC: Declare const properly for
enum texts') changed this, but most drivers still use 'const char
* []' as the type for their enum text arrays.

Change these occurrences of 'static * const char * []' to 'static const
char * const []'.

The conversion was done automatically using the following coccinelle semantic
patch:
// <smpl>
@disable optional_qualifier@
identifier s;
@@
 static
-const char *
+const char * const
 s[] = ...;
// </smpl>

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2016-11-12 14:23:13 +01:00 committed by Mark Brown
parent 28ab49bf9b
commit 92be58106e
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/pxa/corgi.c
View File

@ -244,9 +244,9 @@ static const struct snd_soc_dapm_route corgi_audio_map[] = {
{"MICIN", NULL, "Line Jack"}, {"MICIN", NULL, "Line Jack"},
}; };
static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", static const char * const jack_function[] = {"Headphone", "Mic", "Line",
"Off"}; "Headset", "Off"};
static const char *spk_function[] = {"On", "Off"}; static const char * const spk_function[] = {"On", "Off"};
static const struct soc_enum corgi_enum[] = { static const struct soc_enum corgi_enum[] = {
SOC_ENUM_SINGLE_EXT(5, jack_function), SOC_ENUM_SINGLE_EXT(5, jack_function),
SOC_ENUM_SINGLE_EXT(2, spk_function), SOC_ENUM_SINGLE_EXT(2, spk_function),

2
sound/soc/pxa/magician.c
View File

@ -376,7 +376,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"VINM", NULL, "Call Mic"}, {"VINM", NULL, "Call Mic"},
}; };
static const char *input_select[] = {"Call Mic", "Headset Mic"}; static const char * const input_select[] = {"Call Mic", "Headset Mic"};
static const struct soc_enum magician_in_sel_enum = static const struct soc_enum magician_in_sel_enum =
SOC_ENUM_SINGLE_EXT(2, input_select); SOC_ENUM_SINGLE_EXT(2, input_select);

4
sound/soc/pxa/poodle.c
View File

@ -209,8 +209,8 @@ static const struct snd_soc_dapm_route poodle_audio_map[] = {
{"MICIN", NULL, "Microphone"}, {"MICIN", NULL, "Microphone"},
}; };
static const char *jack_function[] = {"Off", "Headphone"}; static const char * const jack_function[] = {"Off", "Headphone"};
static const char *spk_function[] = {"Off", "On"}; static const char * const spk_function[] = {"Off", "On"};
static const struct soc_enum poodle_enum[] = { static const struct soc_enum poodle_enum[] = {
SOC_ENUM_SINGLE_EXT(2, jack_function), SOC_ENUM_SINGLE_EXT(2, jack_function),
SOC_ENUM_SINGLE_EXT(2, spk_function), SOC_ENUM_SINGLE_EXT(2, spk_function),

6
sound/soc/pxa/spitz.c
View File

@ -241,9 +241,9 @@ static const struct snd_soc_dapm_route spitz_audio_map[] = {
{"LINPUT1", NULL, "Line Jack"}, {"LINPUT1", NULL, "Line Jack"},
}; };
static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", static const char * const jack_function[] = {"Headphone", "Mic", "Line",
"Off"}; "Headset", "Off"};
static const char *spk_function[] = {"On", "Off"}; static const char * const spk_function[] = {"On", "Off"};
static const struct soc_enum spitz_enum[] = { static const struct soc_enum spitz_enum[] = {
SOC_ENUM_SINGLE_EXT(5, jack_function), SOC_ENUM_SINGLE_EXT(5, jack_function),
SOC_ENUM_SINGLE_EXT(2, spk_function), SOC_ENUM_SINGLE_EXT(2, spk_function),

6
sound/soc/pxa/tosa.c
View File

@ -170,9 +170,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
{"Mic Bias", NULL, "Headset Jack"}, {"Mic Bias", NULL, "Headset Jack"},
}; };
static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", static const char * const jack_function[] = {"Headphone", "Mic", "Line",
"Off"}; "Headset", "Off"};
static const char *spk_function[] = {"On", "Off"}; static const char * const spk_function[] = {"On", "Off"};
static const struct soc_enum tosa_enum[] = { static const struct soc_enum tosa_enum[] = {
SOC_ENUM_SINGLE_EXT(5, jack_function), SOC_ENUM_SINGLE_EXT(5, jack_function),
SOC_ENUM_SINGLE_EXT(2, spk_function), SOC_ENUM_SINGLE_EXT(2, spk_function),