---

yaml --- r: 293261 b: refs/heads/master c: 69edea8 h: refs/heads/master i: 293259: 6a8619d v: v3
git-mirror · Jan 31, 2012 · f3ecb72 · f3ecb72
1 parent a20357e
commit f3ecb72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 394d2bbae3dbde0972b90415fc4b5628bbfd700f
+refs/heads/master: 69edea8a50fb88edd0f23eecfb89ef513b68eaee
diff --git a/trunk/sound/soc/codecs/max9768.c b/trunk/sound/soc/codecs/max9768.c
@@ -115,7 +115,7 @@ static const struct snd_kcontrol_new max9768_volume[] = {
 };
 
 static const struct snd_kcontrol_new max9768_mute[] = {
-	SOC_SINGLE_BOOL_EXT("Mute Switch", 0, max9768_get_gpio, max9768_set_gpio),
+	SOC_SINGLE_BOOL_EXT("Playback Switch", 0, max9768_get_gpio, max9768_set_gpio),
 };
 
 static int max9768_probe(struct snd_soc_codec *codec)
@@ -150,18 +150,12 @@ static struct snd_soc_codec_driver max9768_codec_driver = {
 	.num_controls = ARRAY_SIZE(max9768_volume),
 };
 
-static bool max9768_always_false(struct device *dev, unsigned int reg)
-{
-	return false;
-}
-
 static const struct regmap_config max9768_i2c_regmap_config = {
 	.reg_bits = 2,
 	.val_bits = 6,
 	.max_register = 3,
 	.reg_defaults = max9768_default_regs,
 	.num_reg_defaults = ARRAY_SIZE(max9768_default_regs),
-	.volatile_reg = max9768_always_false,
 	.cache_type = REGCACHE_RBTREE,
 };