diff options
| -rw-r--r-- | drivers/hv/hv_fcopy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hv/hv_fcopy.c b/drivers/hv/hv_fcopy.c index 8bdf752ed035..c14f0f4a0d77 100644 --- a/drivers/hv/hv_fcopy.c +++ b/drivers/hv/hv_fcopy.c @@ -75,11 +75,11 @@ static bool opened; /* currently device opened */ static bool in_hand_shake = true; static void fcopy_send_data(void); static void fcopy_respond_to_host(int error); -static void fcopy_work_func(struct work_struct *dummy); -static DECLARE_DELAYED_WORK(fcopy_work, fcopy_work_func); +static void fcopy_timeout_func(struct work_struct *dummy); +static DECLARE_DELAYED_WORK(fcopy_timeout_work, fcopy_timeout_func); static u8 *recv_buffer; -static void fcopy_work_func(struct work_struct *dummy) +static void fcopy_timeout_func(struct work_struct *dummy) { /* * If the timer fires, the user-mode component has not responded; @@ -261,7 +261,7 @@ void hv_fcopy_onchannelcallback(void *context) /* * Send the information to the user-level daemon. */ - schedule_delayed_work(&fcopy_work, 5*HZ); + schedule_delayed_work(&fcopy_timeout_work, 5*HZ); fcopy_send_data(); return; } @@ -336,7 +336,7 @@ static ssize_t fcopy_write(struct file *file, const char __user *buf, * Complete the transaction by forwarding the result * to the host. But first, cancel the timeout. */ - if (cancel_delayed_work_sync(&fcopy_work)) { + if (cancel_delayed_work_sync(&fcopy_timeout_work)) fcopy_respond_to_host(response); hv_poll_channel(fcopy_transaction.fcopy_context, hv_fcopy_onchannelcallback); @@ -378,7 +378,7 @@ static int fcopy_release(struct inode *inode, struct file *f) in_hand_shake = true; opened = false; - if (cancel_delayed_work_sync(&fcopy_work)) { + if (cancel_delayed_work_sync(&fcopy_timeout_work)) { /* We haven't up()-ed the semaphore(very rare)? */ if (down_trylock(&fcopy_transaction.read_sema)) ; @@ -442,6 +442,6 @@ int hv_fcopy_init(struct hv_util_service *srv) void hv_fcopy_deinit(void) { - cancel_delayed_work_sync(&fcopy_work); + cancel_delayed_work_sync(&fcopy_timeout_work); fcopy_dev_deinit(); } |