From: Tejun Heo <tj@kernel.org>
Date: Sat, 11 Dec 2010 16:51:36 +0000 (+0100)
Subject: HID: hid-picolcd: don't use flush_scheduled_work()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c4ffafa51bb0bea648a4ca119033a95057799c9d;p=deliverable%2Flinux.git

HID: hid-picolcd: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush picolcd_fb_cleanup on exit instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index e4ce47156106..ed0e066b7f07 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -2750,7 +2750,7 @@ static void __exit picolcd_exit(void)
 {
 	hid_unregister_driver(&picolcd_driver);
 #ifdef CONFIG_HID_PICOLCD_FB
-	flush_scheduled_work();
+	flush_work_sync(&picolcd_fb_cleanup);
 	WARN_ON(fb_pending);
 #endif
 }