aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/loopback.c
diff options
context:
space:
mode:
authorsayli karnik <karniksayli1995@gmail.com>2016-09-22 22:09:06 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-23 19:00:43 +0200
commit82af03f7b945634bfa93fef4e2f50db4459aabea (patch)
tree7ca257aa04c1a545490a2ecb7f640f79e01723e3 /drivers/staging/greybus/loopback.c
parentstaging: wlan-ng: remove unnecessary spaces before casts (diff)
downloadlinux-dev-82af03f7b945634bfa93fef4e2f50db4459aabea.tar.xz
linux-dev-82af03f7b945634bfa93fef4e2f50db4459aabea.zip
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 <karniksayli1995@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/greybus/loopback.c')
-rw-r--r--drivers/staging/greybus/loopback.c5
1 files 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;