浏览代码

ASoC: arizona: Don't request FLL lock IRQ

We only log the result and since the interrupt triggers on loss of lock
during shutdown this may lead to spurious interrupts during shutdown
delaying the process.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Mark Brown 12 年之前
父节点
当前提交
c98137bfcb
共有 2 个文件被更改,包括 0 次插入20 次删除
  1. 0 19
      sound/soc/codecs/arizona.c
  2. 0 1
      sound/soc/codecs/arizona.h

+ 0 - 19
sound/soc/codecs/arizona.c

@@ -897,17 +897,6 @@ int arizona_init_dai(struct arizona_priv *priv, int id)
 }
 }
 EXPORT_SYMBOL_GPL(arizona_init_dai);
 EXPORT_SYMBOL_GPL(arizona_init_dai);
 
 
-static irqreturn_t arizona_fll_lock(int irq, void *data)
-{
-	struct arizona_fll *fll = data;
-
-	arizona_fll_dbg(fll, "Lock status changed\n");
-
-	complete(&fll->lock);
-
-	return IRQ_HANDLED;
-}
-
 static irqreturn_t arizona_fll_clock_ok(int irq, void *data)
 static irqreturn_t arizona_fll_clock_ok(int irq, void *data)
 {
 {
 	struct arizona_fll *fll = data;
 	struct arizona_fll *fll = data;
@@ -1147,7 +1136,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
 {
 {
 	int ret;
 	int ret;
 
 
-	init_completion(&fll->lock);
 	init_completion(&fll->ok);
 	init_completion(&fll->ok);
 
 
 	fll->id = id;
 	fll->id = id;
@@ -1158,13 +1146,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
 	snprintf(fll->clock_ok_name, sizeof(fll->clock_ok_name),
 	snprintf(fll->clock_ok_name, sizeof(fll->clock_ok_name),
 		 "FLL%d clock OK", id);
 		 "FLL%d clock OK", id);
 
 
-	ret = arizona_request_irq(arizona, lock_irq, fll->lock_name,
-				  arizona_fll_lock, fll);
-	if (ret != 0) {
-		dev_err(arizona->dev, "Failed to get FLL%d lock IRQ: %d\n",
-			id, ret);
-	}
-
 	ret = arizona_request_irq(arizona, ok_irq, fll->clock_ok_name,
 	ret = arizona_request_irq(arizona, ok_irq, fll->clock_ok_name,
 				  arizona_fll_clock_ok, fll);
 				  arizona_fll_clock_ok, fll);
 	if (ret != 0) {
 	if (ret != 0) {

+ 0 - 1
sound/soc/codecs/arizona.h

@@ -197,7 +197,6 @@ struct arizona_fll {
 	int id;
 	int id;
 	unsigned int base;
 	unsigned int base;
 	unsigned int vco_mult;
 	unsigned int vco_mult;
-	struct completion lock;
 	struct completion ok;
 	struct completion ok;
 	unsigned int fref;
 	unsigned int fref;
 	unsigned int fout;
 	unsigned int fout;