connection: remove unused variable
authorDaniel Mack <daniel@zonque.org>
Wed, 22 Oct 2014 11:49:05 +0000 (13:49 +0200)
committerDaniel Mack <daniel@zonque.org>
Wed, 22 Oct 2014 11:49:05 +0000 (13:49 +0200)
That was introduced by a wrong conflict resolution.

Signed-off-by: Daniel Mack <daniel@zonque.org>
connection.c

index 8adf1167ce62badd06e7cbd33d7459c6f1c399f7..b1458f614d969950a243afe9fc863f3f46709725 100644 (file)
@@ -713,7 +713,6 @@ int kdbus_conn_kmsg_send(struct kdbus_ep *ep,
        struct kdbus_bus *bus = ep->bus;
        bool sync = msg->flags & KDBUS_MSG_FLAGS_SYNC_REPLY;
        int ret = 0;
-       u64 usecs;
 
        /* assign domain-global message sequence number */
        BUG_ON(kmsg->seq > 0);
@@ -869,7 +868,6 @@ int kdbus_conn_kmsg_send(struct kdbus_ep *ep,
                else
                        timeout = msg->timeout_ns - now;
 
-               usecs = div_u64(msg->timeout_ns, 1000ULL);
                ret = kdbus_conn_wait_reply(ep, conn_src, conn_dst, msg,
                                            reply_wait, timeout);
        }