Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330503
b: refs/heads/master
c: 2a09258
h: refs/heads/master
i:
  330501: a185b21
  330499: e9ed478
  330495: 27f3776
v: v3
  • Loading branch information
Kim, Milo authored and Anton Vorontsov committed Sep 21, 2012
1 parent cccc755 commit b2ebb53
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 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: 60fd57e06ed7ea13bc0bdf4cb5324d47039105ab
refs/heads/master: 2a0925827be53db6252afadc79c657b14638ff4a
13 changes: 1 addition & 12 deletions trunk/drivers/power/lp8727_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ struct lp8727_chg {
struct i2c_client *client;
struct mutex xfer_lock;
struct delayed_work work;
struct workqueue_struct *irqthread;
struct lp8727_platform_data *pdata;
struct lp8727_psy *psy;
struct lp8727_chg_param *chg_parm;
Expand Down Expand Up @@ -238,9 +237,7 @@ static irqreturn_t lp8727_isr_func(int irq, void *ptr)
{
struct lp8727_chg *pchg = ptr;

queue_delayed_work(pchg->irqthread, &pchg->work,
pchg->debounce_jiffies);

schedule_delayed_work(&pchg->work, pchg->debounce_jiffies);
return IRQ_HANDLED;
}

Expand All @@ -251,12 +248,6 @@ static int lp8727_intr_config(struct lp8727_chg *pchg)

INIT_DELAYED_WORK(&pchg->work, lp8727_delayed_func);

pchg->irqthread = create_singlethread_workqueue("lp8727-irqthd");
if (!pchg->irqthread) {
dev_err(pchg->dev, "can not create thread for lp8727\n");
return -ENOMEM;
}

pchg->debounce_jiffies = msecs_to_jiffies(delay_msec);

return request_threaded_irq(pchg->client->irq,
Expand Down Expand Up @@ -486,8 +477,6 @@ static int __devexit lp8727_remove(struct i2c_client *cl)
struct lp8727_chg *pchg = i2c_get_clientdata(cl);

free_irq(pchg->client->irq, pchg);
flush_workqueue(pchg->irqthread);
destroy_workqueue(pchg->irqthread);
lp8727_unregister_psy(pchg);
return 0;
}
Expand Down

0 comments on commit b2ebb53

Please sign in to comment.