aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOder Chiou <oder_chiou@realtek.com>2014-11-19 00:52:19 -0500
committerMark Brown <broonie@kernel.org>2014-11-19 05:18:05 -0500
commit35d40d10e95f52569570dc4e26da19f072aa256d (patch)
treeaaee7b8c7c6fbbe61e3bed9e7046864b0fd62ed8
parent2dfe2b08d280c15cc7266de40412c2a911643148 (diff)
ASoC: rt5677: Follow the gpio naming rule to rename the irq function
Follow the gpio naming rule to rename the irq function. Signed-off-by: Oder Chiou <oder_chiou@realtek.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/rt5677.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index b2d88bb14cfe..dd080cdbff10 100644
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -4552,7 +4552,7 @@ static struct regmap_irq_chip rt5677_irq_chip = {
4552 .mask_invert = 1, 4552 .mask_invert = 1,
4553}; 4553};
4554 4554
4555static int rt5677_irq_init(struct i2c_client *i2c) 4555static int rt5677_init_irq(struct i2c_client *i2c)
4556{ 4556{
4557 int ret; 4557 int ret;
4558 struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c); 4558 struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c);
@@ -4579,7 +4579,7 @@ static int rt5677_irq_init(struct i2c_client *i2c)
4579 return 0; 4579 return 0;
4580} 4580}
4581 4581
4582static void rt5677_irq_exit(struct i2c_client *i2c) 4582static void rt5677_free_irq(struct i2c_client *i2c)
4583{ 4583{
4584 struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c); 4584 struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c);
4585 4585
@@ -4693,7 +4693,7 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
4693 } 4693 }
4694 4694
4695 rt5677_init_gpio(i2c); 4695 rt5677_init_gpio(i2c);
4696 rt5677_irq_init(i2c); 4696 rt5677_init_irq(i2c);
4697 4697
4698 return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5677, 4698 return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5677,
4699 rt5677_dai, ARRAY_SIZE(rt5677_dai)); 4699 rt5677_dai, ARRAY_SIZE(rt5677_dai));
@@ -4701,9 +4701,8 @@ static int rt5677_i2c_probe(struct i2c_client *i2c,
4701 4701
4702static int rt5677_i2c_remove(struct i2c_client *i2c) 4702static int rt5677_i2c_remove(struct i2c_client *i2c)
4703{ 4703{
4704 rt5677_irq_exit(i2c);
4705
4706 snd_soc_unregister_codec(&i2c->dev); 4704 snd_soc_unregister_codec(&i2c->dev);
4705 rt5677_free_irq(i2c);
4707 rt5677_free_gpio(i2c); 4706 rt5677_free_gpio(i2c);
4708 4707
4709 return 0; 4708 return 0;