diff options
author | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:07 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-12-24 09:59:07 -0500 |
commit | d9c612eb6e9ccb8192e6c4d609dbbf178020c672 (patch) | |
tree | 6c10992888953d550bbedb169dc40e57806a6c67 /drivers/macintosh | |
parent | a6665944ef83b6a2db8fc5b323c9fca92375a643 (diff) |
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 <tj@kernel.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/ams/ams-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) | |||
226 | * We do this after ams_info.exit(), because an interrupt might | 226 | * We do this after ams_info.exit(), because an interrupt might |
227 | * have arrived before disabling them. | 227 | * have arrived before disabling them. |
228 | */ | 228 | */ |
229 | flush_scheduled_work(); | 229 | flush_work_sync(&ams_info.worker); |
230 | 230 | ||
231 | /* Remove device */ | 231 | /* Remove device */ |
232 | of_device_unregister(ams_info.of_dev); | 232 | of_device_unregister(ams_info.of_dev); |