diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-16 20:07:42 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-17 11:10:06 -0500 |
commit | 3056557f3b2387d4ac99ca8af14956cd2bf003c2 (patch) | |
tree | 50e637171d2a717c7e3993d5ae6b684e3cebc1bf /include | |
parent | 7bd3a6f34cdd4b1776ca34d0b6fab216e9323759 (diff) |
ASoC: dapm: Constify lots of names that are never modified
Neater and avoids warnings when used in other places where const strings
are desired.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/soc-dapm.h | 8 | ||||
-rw-r--r-- | include/sound/soc.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index c32c52167b53..91eb8126c00e 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -445,8 +445,8 @@ struct snd_soc_dapm_route { | |||
445 | 445 | ||
446 | /* dapm audio path between two widgets */ | 446 | /* dapm audio path between two widgets */ |
447 | struct snd_soc_dapm_path { | 447 | struct snd_soc_dapm_path { |
448 | char *name; | 448 | const char *name; |
449 | char *long_name; | 449 | const char *long_name; |
450 | 450 | ||
451 | /* source (input) and sink (output) widgets */ | 451 | /* source (input) and sink (output) widgets */ |
452 | struct snd_soc_dapm_widget *source; | 452 | struct snd_soc_dapm_widget *source; |
@@ -469,8 +469,8 @@ struct snd_soc_dapm_path { | |||
469 | /* dapm widget */ | 469 | /* dapm widget */ |
470 | struct snd_soc_dapm_widget { | 470 | struct snd_soc_dapm_widget { |
471 | enum snd_soc_dapm_type id; | 471 | enum snd_soc_dapm_type id; |
472 | char *name; /* widget name */ | 472 | const char *name; /* widget name */ |
473 | char *sname; /* stream name */ | 473 | const char *sname; /* stream name */ |
474 | struct snd_soc_codec *codec; | 474 | struct snd_soc_codec *codec; |
475 | struct snd_soc_platform *platform; | 475 | struct snd_soc_platform *platform; |
476 | struct list_head list; | 476 | struct list_head list; |
diff --git a/include/sound/soc.h b/include/sound/soc.h index 8fa4dcaa096b..1e16d6e3f2a8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -366,7 +366,7 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec); | |||
366 | *Controls | 366 | *Controls |
367 | */ | 367 | */ |
368 | struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template, | 368 | struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template, |
369 | void *data, char *long_name, | 369 | void *data, const char *long_name, |
370 | const char *prefix); | 370 | const char *prefix); |
371 | int snd_soc_add_codec_controls(struct snd_soc_codec *codec, | 371 | int snd_soc_add_codec_controls(struct snd_soc_codec *codec, |
372 | const struct snd_kcontrol_new *controls, int num_controls); | 372 | const struct snd_kcontrol_new *controls, int num_controls); |