diff options
-rw-r--r-- | sound/soc/codecs/arizona.c | 19 | ||||
-rw-r--r-- | sound/soc/codecs/arizona.h | 1 |
2 files changed, 0 insertions, 20 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index f919a3ae2887..a12dd1669886 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
@@ -897,17 +897,6 @@ int arizona_init_dai(struct arizona_priv *priv, int id) | |||
897 | } | 897 | } |
898 | EXPORT_SYMBOL_GPL(arizona_init_dai); | 898 | EXPORT_SYMBOL_GPL(arizona_init_dai); |
899 | 899 | ||
900 | static irqreturn_t arizona_fll_lock(int irq, void *data) | ||
901 | { | ||
902 | struct arizona_fll *fll = data; | ||
903 | |||
904 | arizona_fll_dbg(fll, "Lock status changed\n"); | ||
905 | |||
906 | complete(&fll->lock); | ||
907 | |||
908 | return IRQ_HANDLED; | ||
909 | } | ||
910 | |||
911 | static irqreturn_t arizona_fll_clock_ok(int irq, void *data) | 900 | static irqreturn_t arizona_fll_clock_ok(int irq, void *data) |
912 | { | 901 | { |
913 | struct arizona_fll *fll = data; | 902 | struct arizona_fll *fll = data; |
@@ -1147,7 +1136,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, | |||
1147 | { | 1136 | { |
1148 | int ret; | 1137 | int ret; |
1149 | 1138 | ||
1150 | init_completion(&fll->lock); | ||
1151 | init_completion(&fll->ok); | 1139 | init_completion(&fll->ok); |
1152 | 1140 | ||
1153 | fll->id = id; | 1141 | fll->id = id; |
@@ -1158,13 +1146,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, | |||
1158 | snprintf(fll->clock_ok_name, sizeof(fll->clock_ok_name), | 1146 | snprintf(fll->clock_ok_name, sizeof(fll->clock_ok_name), |
1159 | "FLL%d clock OK", id); | 1147 | "FLL%d clock OK", id); |
1160 | 1148 | ||
1161 | ret = arizona_request_irq(arizona, lock_irq, fll->lock_name, | ||
1162 | arizona_fll_lock, fll); | ||
1163 | if (ret != 0) { | ||
1164 | dev_err(arizona->dev, "Failed to get FLL%d lock IRQ: %d\n", | ||
1165 | id, ret); | ||
1166 | } | ||
1167 | |||
1168 | ret = arizona_request_irq(arizona, ok_irq, fll->clock_ok_name, | 1149 | ret = arizona_request_irq(arizona, ok_irq, fll->clock_ok_name, |
1169 | arizona_fll_clock_ok, fll); | 1150 | arizona_fll_clock_ok, fll); |
1170 | if (ret != 0) { | 1151 | if (ret != 0) { |
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h index 697ff6fcaba4..116372c91f5d 100644 --- a/sound/soc/codecs/arizona.h +++ b/sound/soc/codecs/arizona.h | |||
@@ -197,7 +197,6 @@ struct arizona_fll { | |||
197 | int id; | 197 | int id; |
198 | unsigned int base; | 198 | unsigned int base; |
199 | unsigned int vco_mult; | 199 | unsigned int vco_mult; |
200 | struct completion lock; | ||
201 | struct completion ok; | 200 | struct completion ok; |
202 | unsigned int fref; | 201 | unsigned int fref; |
203 | unsigned int fout; | 202 | unsigned int fout; |