Merge remote-tracking branches 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc...
[sfrench/cifs-2.6.git] / sound / soc / codecs / zx_aud96p22.c
index 032fb7cf6cbdfce68f00577c41243561b9534742..ca1932d137385f054cb53cf69056940a6284792c 100644 (file)
@@ -261,7 +261,7 @@ static const struct snd_soc_dapm_route aud96p22_dapm_routes[] = {
        { "LINEOUTMN", NULL, "LD2" },
 };
 
        { "LINEOUTMN", NULL, "LD2" },
 };
 
-static struct snd_soc_codec_driver aud96p22_driver = {
+static const struct snd_soc_codec_driver aud96p22_driver = {
        .component_driver = {
                .controls = aud96p22_snd_controls,
                .num_controls = ARRAY_SIZE(aud96p22_snd_controls),
        .component_driver = {
                .controls = aud96p22_snd_controls,
                .num_controls = ARRAY_SIZE(aud96p22_snd_controls),
@@ -312,7 +312,7 @@ static int aud96p22_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
        return 0;
 }
 
        return 0;
 }
 
-static struct snd_soc_dai_ops aud96p22_dai_ops = {
+static const struct snd_soc_dai_ops aud96p22_dai_ops = {
        .set_fmt = aud96p22_set_fmt,
 };
 
        .set_fmt = aud96p22_set_fmt,
 };
 
@@ -382,7 +382,7 @@ static int aud96p22_i2c_remove(struct i2c_client *i2c)
        return 0;
 }
 
        return 0;
 }
 
-const struct of_device_id aud96p22_dt_ids[] = {
+static const struct of_device_id aud96p22_dt_ids[] = {
        { .compatible = "zte,zx-aud96p22", },
        { }
 };
        { .compatible = "zte,zx-aud96p22", },
        { }
 };