Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / mfd / tps65010.c

diff --git a/drivers/mfd/tps65010.c b/drivers/mfd/tps65010.c
index d0016b67d125ce40b8d9a810f1abb7ade2678756..93d5fdf020c7eaa90dbf4d1eee41de216873d78e 100644 (file)
--- a/drivers/mfd/tps65010.c
+++ b/drivers/mfd/tps65010.c
@@ -34,7 +34,7 @@
 
 #include <linux/i2c/tps65010.h>
 
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 
 
 /*-------------------------------------------------------------------------*/
@@ -242,7 +242,7 @@ static int dbg_show(struct seq_file *s, void *_)
        seq_printf(s, "mask2     %s\n", buf);
        /* ignore ackint2 */
 
-       (void) schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
+       schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
 
 
        /* VMAIN voltage, enable lowpower, etc */
@@ -400,7 +400,7 @@ static void tps65010_interrupt(struct tps65010 *tps)
                        && (tps->chgstatus & (TPS_CHG_USB|TPS_CHG_AC)))
                poll = 1;
        if (poll)
-               (void) schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
+               schedule_delayed_work(&tps->work, POWER_POLL_DELAY);
 
        /* also potentially gpio-in rise or fall */
 }
@@ -410,7 +410,7 @@ static void tps65010_work(struct work_struct *work)
 {
        struct tps65010         *tps;
 
-       tps = container_of(work, struct tps65010, work.work);
+       tps = container_of(to_delayed_work(work), struct tps65010, work);
        mutex_lock(&tps->lock);
 
        tps65010_interrupt(tps);
@@ -448,7 +448,7 @@ static irqreturn_t tps65010_irq(int irq, void *_tps)
 
        disable_irq_nosync(irq);
        set_bit(FLAG_IRQ_ENABLE, &tps->flags);
-       (void) schedule_work(&tps->work.work);
+       schedule_delayed_work(&tps->work, 0);
        return IRQ_HANDLED;
 }
 
@@ -527,8 +527,7 @@ static int __exit tps65010_remove(struct i2c_client *client)
        }
        if (client->irq > 0)
                free_irq(client->irq, tps);
-       cancel_delayed_work(&tps->work);
-       flush_scheduled_work();
+       cancel_delayed_work_sync(&tps->work);
        debugfs_remove(tps->file);
        kfree(tps);
        the_tps = NULL;
@@ -720,7 +719,7 @@ int tps65010_set_vbus_draw(unsigned mA)
                        && test_and_set_bit(
                                FLAG_VBUS_CHANGED, &the_tps->flags)) {
                /* gadget drivers call this in_irq() */
-               (void) schedule_work(&the_tps->work.work);
+               schedule_delayed_work(&the_tps->work, 0);
        }
        local_irq_restore(flags);