From 82af03f7b945634bfa93fef4e2f50db4459aabea Mon Sep 17 00:00:00 2001 From: sayli karnik Date: Thu, 22 Sep 2016 22:09:06 +0530 Subject: [PATCH] staging: greybus: Use setup_timer function This patch uses setup_timer function instead of initializing timer with the function and data fields. Signed-off-by: sayli karnik Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/loopback.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 8b0d0dc2ed8b..7882306adeca 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -603,7 +603,6 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type, return -ENOMEM; INIT_WORK(&op_async->work, gb_loopback_async_operation_work); - init_timer(&op_async->timer); kref_init(&op_async->kref); operation = gb_operation_create(gb->connection, type, request_size, @@ -634,9 +633,9 @@ static int gb_loopback_async_operation(struct gb_loopback *gb, int type, if (ret) goto error; - op_async->timer.function = gb_loopback_async_operation_timeout; + setup_timer(&op_async->timer, gb_loopback_async_operation_timeout, + (unsigned long)operation->id); op_async->timer.expires = jiffies + gb->jiffy_timeout; - op_async->timer.data = (unsigned long)operation->id; add_timer(&op_async->timer); goto done;