iio: light: tsl2563: Remove flush_scheduled_work
authorAmitoj Kaur Chawla <amitoj1606@gmail.com>
Thu, 17 Mar 2016 13:55:11 +0000 (19:25 +0530)
committerJonathan Cameron <jic23@kernel.org>
Sun, 20 Mar 2016 11:04:49 +0000 (11:04 +0000)
flush_scheduled_work is scheduled for deprecation.
Replace cancel_delayed_work and flush_scheduled_work with
cancel_delayed_work_sync instead to ensure there is no pending or
running work item.

Since there is only one work item, chip->poweroff_work, there are
no further dependencies of flush_scheduled_work().

Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/light/tsl2563.c

index 12731d6b89ecdf39d7d6c7c42c3c53ebb32a8d7a..57b108c30e9801165658a9fef26d3b0e44586b94 100644 (file)
@@ -806,8 +806,7 @@ static int tsl2563_probe(struct i2c_client *client,
        return 0;
 
 fail:
-       cancel_delayed_work(&chip->poweroff_work);
-       flush_scheduled_work();
+       cancel_delayed_work_sync(&chip->poweroff_work);
        return err;
 }