Commit 3056557f authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 7bd3a6f3

include/sound/soc-dapm.h

+4 −4
Original line number Diff line number Diff line
@@ -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;

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/soc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;