Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tpm: don't use flush_scheduled_work()

flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush chip->work instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Debora Velarde <debora@linux.vnet.ibm.com>
Cc: Rajiv Andrade <srajiv@linux.vnet.ibm.com>

Tejun Heo 2e5c44c9 3514870f

+2 -2
+2 -2
drivers/char/tpm/tpm.c
··· 986 986 struct tpm_chip *chip = file->private_data; 987 987 988 988 del_singleshot_timer_sync(&chip->user_read_timer); 989 - flush_scheduled_work(); 989 + flush_work_sync(&chip->work); 990 990 file->private_data = NULL; 991 991 atomic_set(&chip->data_pending, 0); 992 992 kfree(chip->data_buffer); ··· 1038 1038 ssize_t ret_size; 1039 1039 1040 1040 del_singleshot_timer_sync(&chip->user_read_timer); 1041 - flush_scheduled_work(); 1041 + flush_work_sync(&chip->work); 1042 1042 ret_size = atomic_read(&chip->data_pending); 1043 1043 atomic_set(&chip->data_pending, 0); 1044 1044 if (ret_size > 0) { /* relay data */