timers: Get rid of del_singleshot_timer_sync()

[sfrench/cifs-2.6.git] / drivers / char / tpm / tpm-dev-common.c

diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c
index dc4c0a0a512903235d9c580789cf2c74453ad5c0..30b4c288c1bbc3ba4dfedd38abf9663ace12e819 100644 (file)
--- a/drivers/char/tpm/tpm-dev-common.c
+++ b/drivers/char/tpm/tpm-dev-common.c
@@ -155,7 +155,7 @@ ssize_t tpm_common_read(struct file *file, char __user *buf,
 out:
        if (!priv->response_length) {
                *off = 0;
-               del_singleshot_timer_sync(&priv->user_read_timer);
+               del_timer_sync(&priv->user_read_timer);
                flush_work(&priv->timeout_work);
        }
        mutex_unlock(&priv->buffer_mutex);
@@ -262,7 +262,7 @@ __poll_t tpm_common_poll(struct file *file, poll_table *wait)
 void tpm_common_release(struct file *file, struct file_priv *priv)
 {
        flush_work(&priv->async_work);
-       del_singleshot_timer_sync(&priv->user_read_timer);
+       del_timer_sync(&priv->user_read_timer);
        flush_work(&priv->timeout_work);
        file->private_data = NULL;
        priv->response_length = 0;