From: Tejun Heo <tj@kernel.org>
Date: Sat, 11 Dec 2010 16:51:44 +0000 (+0100)
Subject: mtd: don't use flush_scheduled_work()
X-Git-Tag: v2.6.38-rc1~21^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75c52a49630a478ffe9c1473441779676817fce6;p=thirdparty%2Fkernel%2Flinux.git

mtd: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush cxt->work_{erase|write} on removal instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index 1ee72f3f05125..8b102736b34ad 100644
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -396,7 +396,8 @@ static void mtdoops_notify_remove(struct mtd_info *mtd)
 		printk(KERN_WARNING "mtdoops: could not unregister kmsg_dumper\n");
 
 	cxt->mtd = NULL;
-	flush_scheduled_work();
+	flush_work_sync(&cxt->work_erase);
+	flush_work_sync(&cxt->work_write);
 }