From: Tejun Heo Date: Fri, 24 Dec 2010 14:59:07 +0000 (+0100) Subject: macintosh/ams: don't use flush_scheduled_work() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9c612eb6e9ccb8192e6c4d609dbbf178020c672;p=linux-beck.git macintosh/ams: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush ams_info.worker on detach instead. Signed-off-by: Tejun Heo --- diff --git a/drivers/macintosh/ams/ams-core.c b/drivers/macintosh/ams/ams-core.c index 2ad62c339cd2..399beb1638d1 100644 --- a/drivers/macintosh/ams/ams-core.c +++ b/drivers/macintosh/ams/ams-core.c @@ -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);