From b2ebb535c366928db5f6f28442448846da87418b Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Fri, 31 Aug 2012 09:23:41 +0000 Subject: [PATCH] --- yaml --- r: 330503 b: refs/heads/master c: 2a0925827be53db6252afadc79c657b14638ff4a h: refs/heads/master i: 330501: a185b21b348edc2793306ce8bd128b0ba852b8a7 330499: e9ed4787cc0b067375d043a3bc79fcd43a3ebe4c 330495: 27f37769c9cb46b1f9f0db4022d645497a670e5a v: v3 --- [refs] | 2 +- trunk/drivers/power/lp8727_charger.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 1c30e1b8d1f4..af02a11cf0f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60fd57e06ed7ea13bc0bdf4cb5324d47039105ab +refs/heads/master: 2a0925827be53db6252afadc79c657b14638ff4a diff --git a/trunk/drivers/power/lp8727_charger.c b/trunk/drivers/power/lp8727_charger.c index 1907b1f7953d..c33532bbb9c7 100644 --- a/trunk/drivers/power/lp8727_charger.c +++ b/trunk/drivers/power/lp8727_charger.c @@ -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; @@ -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; } @@ -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, @@ -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; }