Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353344
b: refs/heads/master
c: c98137b
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown committed Jan 16, 2013
1 parent 5b7f882 commit bdc932d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f48aa392219a22655417aa0e2d6889291e934c45
refs/heads/master: c98137bfcb4afd4415864258dd8ecf05c2bb5843
19 changes: 0 additions & 19 deletions trunk/sound/soc/codecs/arizona.c
Original file line number Diff line number Diff line change
Expand Up @@ -897,17 +897,6 @@ int arizona_init_dai(struct arizona_priv *priv, int id)
}
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)
{
struct arizona_fll *fll = data;
Expand Down Expand Up @@ -1147,7 +1136,6 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq,
{
int ret;

init_completion(&fll->lock);
init_completion(&fll->ok);

fll->id = id;
Expand All @@ -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),
"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,
arizona_fll_clock_ok, fll);
if (ret != 0) {
Expand Down
1 change: 0 additions & 1 deletion trunk/sound/soc/codecs/arizona.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ struct arizona_fll {
int id;
unsigned int base;
unsigned int vco_mult;
struct completion lock;
struct completion ok;
unsigned int fref;
unsigned int fout;
Expand Down

0 comments on commit bdc932d

Please sign in to comment.