]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
macintosh/ams: don't use flush_scheduled_work()
authorTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:07 +0000 (15:59 +0100)
committerTejun Heo <tj@kernel.org>
Fri, 24 Dec 2010 14:59:07 +0000 (15:59 +0100)
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush ams_info.worker on detach instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/macintosh/ams/ams-core.c

index 2ad62c339cd2c9cf849dc3a551a8d47548ef2190..399beb1638d1aa9acf009c1c05aeb9cf1bc79af2 100644 (file)
@@ -226,7 +226,7 @@ void ams_sensor_detach(void)
         * We do this after ams_info.exit(), because an interrupt might
         * have arrived before disabling them.
         */
-       flush_scheduled_work();
+       flush_work_sync(&ams_info.worker);
 
        /* Remove device */
        of_device_unregister(ams_info.of_dev);