diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-16 17:07:42 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-17 08:10:06 -0800 |
| commit | 3056557f3b2387d4ac99ca8af14956cd2bf003c2 (patch) | |
| tree | 50e637171d2a717c7e3993d5ae6b684e3cebc1bf | |
| 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>
| -rw-r--r-- | include/sound/soc-dapm.h | 8 | ||||
| -rw-r--r-- | include/sound/soc.h | 2 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index c32c52167b5..91eb8126c00 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -445,8 +445,8 @@ struct snd_soc_dapm_route { /* dapm audio path between two widgets */ struct snd_soc_dapm_path { - char *name; - char *long_name; + const char *name; + const char *long_name; /* source (input) and sink (output) widgets */ struct snd_soc_dapm_widget *source; @@ -469,8 +469,8 @@ struct snd_soc_dapm_path { /* dapm widget */ struct snd_soc_dapm_widget { enum snd_soc_dapm_type id; - char *name; /* widget name */ - char *sname; /* stream name */ + const char *name; /* widget name */ + const char *sname; /* stream name */ struct snd_soc_codec *codec; struct snd_soc_platform *platform; struct list_head list; diff --git a/include/sound/soc.h b/include/sound/soc.h index 8fa4dcaa096..1e16d6e3f2a 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); *Controls */ struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template, - void *data, char *long_name, + void *data, const char *long_name, const char *prefix); int snd_soc_add_codec_controls(struct snd_soc_codec *codec, const struct snd_kcontrol_new *controls, int num_controls); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7645b8a545c..77d230cba61 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2018,7 +2018,7 @@ EXPORT_SYMBOL_GPL(snd_soc_set_runtime_hwparams); * Returns 0 for success, else error. */ struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template, - void *data, char *long_name, + void *data, const char *long_name, const char *prefix) { struct snd_kcontrol_new template; |