From: Daniel Mack Date: Wed, 22 Oct 2014 11:49:05 +0000 (+0200) Subject: connection: remove unused variable X-Git-Tag: upstream/0.20141102.012929utc~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48ea3dc4a9c5b28be4073f39ba56c1d933161e76;p=platform%2Fcore%2Fsystem%2Fkdbus-bus.git connection: remove unused variable That was introduced by a wrong conflict resolution. Signed-off-by: Daniel Mack --- diff --git a/connection.c b/connection.c index 8adf116..b1458f6 100644 --- a/connection.c +++ b/connection.c @@ -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); }