Skip to content

Commit

Permalink
ASoC: dapm: Constify lots of names that are never modified
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Feb 17, 2012
1 parent 7bd3a6f commit 3056557
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions include/sound/soc-dapm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3056557

Please sign in to comment.