Merge remote-tracking branches 'asoc/topic/adau1977', 'asoc/topic/arizona', 'asoc...
authorMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:21 +0000 (12:12 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:21 +0000 (12:12 +0100)
1  2  3  4  5  6 
sound/soc/codecs/adau1977.c
sound/soc/codecs/cs47l24.c
sound/soc/codecs/wm5102.c
sound/soc/codecs/wm5110.c

index 3292816757656c1919c5c88cdeba6673fed59099,ccc5cf0e4f809296ae79d8802ecd6512339fd9c9,b319db6a69f8dd073fe39a25998b0212cb5d94e2,b319db6a69f8dd073fe39a25998b0212cb5d94e2,b319db6a69f8dd073fe39a25998b0212cb5d94e2,b319db6a69f8dd073fe39a25998b0212cb5d94e2..e384f212beb2cc7cd90320952e1dda41c5064d1a
@@@@@@@ -388,8 -388,7 -388,8 -388,8 -388,8 -388,8 +388,7 @@@@@@@ static int adau1977_power_disable(struc
      
        regcache_mark_dirty(adau1977->regmap);
      
- ----  if (adau1977->reset_gpio)
- ----          gpiod_set_value_cansleep(adau1977->reset_gpio, 0);
+ ++++  gpiod_set_value_cansleep(adau1977->reset_gpio, 0);
      
        regcache_cache_only(adau1977->regmap, true);
      
@@@@@@@ -420,8 -419,7 -420,8 -420,8 -420,8 -420,8 +419,7 @@@@@@@ static int adau1977_power_enable(struc
                        goto err_disable_avdd;
        }
      
- ----  if (adau1977->reset_gpio)
- ----          gpiod_set_value_cansleep(adau1977->reset_gpio, 1);
+ ++++  gpiod_set_value_cansleep(adau1977->reset_gpio, 1);
      
        regcache_cache_only(adau1977->regmap, false);
      
@@@@@@@ -867,7 -865,7 -867,7 -867,7 -867,7 -867,7 +865,7 @@@@@@@ static int adau1977_codec_probe(struct 
        return 0;
      }
      
 -----static struct snd_soc_codec_driver adau1977_codec_driver = {
 +++++static const struct snd_soc_codec_driver adau1977_codec_driver = {
        .probe = adau1977_codec_probe,
        .set_bias_level = adau1977_set_bias_level,
        .set_sysclk = adau1977_set_sysclk,
index 505dbc9d73cfe30cef585a9c8ba01e4aa5c2f711,47e6fddef92b8e7af04e88de54ba04f0409736f6,c1cbe23169d75555dd15fc4918505a07f601cd18,47e6fddef92b8e7af04e88de54ba04f0409736f6,47e6fddef92b8e7af04e88de54ba04f0409736f6,47e6fddef92b8e7af04e88de54ba04f0409736f6..e09fc8f037f10c5f04d62369c89852ab3b9273cc
@@@@@@@ -1183,7 -1183,7 -1183,7 -1183,7 -1183,7 -1183,7 +1183,7 @@@@@@@ static struct regmap *cs47l24_get_regma
        return priv->core.arizona->regmap;
      }
      
 -----static struct snd_soc_codec_driver soc_codec_dev_cs47l24 = {
 +++++static const struct snd_soc_codec_driver soc_codec_dev_cs47l24 = {
        .probe = cs47l24_codec_probe,
        .remove = cs47l24_codec_remove,
        .get_regmap = cs47l24_get_regmap,
        },
      };
      
-- ---static struct snd_compr_ops cs47l24_compr_ops = {
++ +++static const struct snd_compr_ops cs47l24_compr_ops = {
        .open = cs47l24_open,
        .free = wm_adsp_compr_free,
        .set_params = wm_adsp_compr_set_params,
        .copy = wm_adsp_compr_copy,
      };
      
 -----static struct snd_soc_platform_driver cs47l24_compr_platform = {
 +++++static const struct snd_soc_platform_driver cs47l24_compr_platform = {
        .compr_ops = &cs47l24_compr_ops,
      };
      
index f5006923be2e21549ab031c6fb3fc21aed9c2e29,1fe358e6be6126572a924911742f111bc7eb5c44,a8bdbe464f2ed51cc39b7e1b210a7b88ac46adcd,1fe358e6be6126572a924911742f111bc7eb5c44,1fe358e6be6126572a924911742f111bc7eb5c44,1fe358e6be6126572a924911742f111bc7eb5c44..72486bf072f2854de417804afab7002158f8b333
@@@@@@@ -2017,7 -2017,7 -2017,7 -2017,7 -2017,7 -2017,7 +2017,7 @@@@@@@ static const struct snd_soc_codec_drive
        },
      };
      
-- ---static struct snd_compr_ops wm5102_compr_ops = {
++ +++static const struct snd_compr_ops wm5102_compr_ops = {
        .open = wm5102_open,
        .free = wm_adsp_compr_free,
        .set_params = wm_adsp_compr_set_params,
        .copy = wm_adsp_compr_copy,
      };
      
 -----static struct snd_soc_platform_driver wm5102_compr_platform = {
 +++++static const struct snd_soc_platform_driver wm5102_compr_platform = {
        .compr_ops = &wm5102_compr_ops,
      };
      
index d6fae1397ce26860b8ddd2bbd6595b8ab862394c,1bc942152effa8f22e7202abd9d245a7ed8eb587,8aa136c28ec14dc123f65a8a007d5dbc05233aee,1bc942152effa8f22e7202abd9d245a7ed8eb587,1bc942152effa8f22e7202abd9d245a7ed8eb587,1bc942152effa8f22e7202abd9d245a7ed8eb587..858a24fc28e80065052d4bff98831680197c5927
@@@@@@@ -2372,7 -2372,7 -2372,7 -2372,7 -2372,7 -2372,7 +2372,7 @@@@@@@ static const struct snd_soc_codec_drive
        },
      };
      
-- ---static struct snd_compr_ops wm5110_compr_ops = {
++ +++static const struct snd_compr_ops wm5110_compr_ops = {
        .open = wm5110_open,
        .free = wm_adsp_compr_free,
        .set_params = wm_adsp_compr_set_params,
        .copy = wm_adsp_compr_copy,
      };
      
 -----static struct snd_soc_platform_driver wm5110_compr_platform = {
 +++++static const struct snd_soc_platform_driver wm5110_compr_platform = {
        .compr_ops = &wm5110_compr_ops,
      };