summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2014-10-27 12:33:43 +0100
committerDaniel Mack <daniel@zonque.org>2014-10-27 12:33:43 +0100
commit28079c549c5d6a92da7336d22b69164b04564a75 (patch)
tree1a380b05f6dce4be74ac78799d304768b1c46cba
parent2171f04b0e5153ef486f2bb02dd0dffbbcd53b82 (diff)
downloadkdbus-bus-28079c549c5d6a92da7336d22b69164b04564a75.tar.gz
kdbus-bus-28079c549c5d6a92da7336d22b69164b04564a75.tar.bz2
kdbus-bus-28079c549c5d6a92da7336d22b69164b04564a75.zip
connection, message: cosmetics
Just two tiny cleanups. Signed-off-by: Daniel Mack <daniel@zonque.org>
-rw-r--r--connection.c5
-rw-r--r--message.c3
2 files changed, 3 insertions, 5 deletions
diff --git a/connection.c b/connection.c
index 4bafc6332fd..898db9cbeba 100644
--- a/connection.c
+++ b/connection.c
@@ -118,9 +118,8 @@ exit_dec_reply_count:
static void __kdbus_conn_reply_free(struct kref *kref)
{
- struct kdbus_conn_reply *reply = container_of(kref,
- struct kdbus_conn_reply,
- kref);
+ struct kdbus_conn_reply *reply =
+ container_of(kref, struct kdbus_conn_reply, kref);
atomic_dec(&reply->reply_dst->reply_count);
kdbus_conn_unref(reply->reply_dst);
diff --git a/message.c b/message.c
index 8f40314f9ed..8550d62b030 100644
--- a/message.c
+++ b/message.c
@@ -222,8 +222,7 @@ static int kdbus_msg_scan_items(struct kdbus_conn *conn,
if (n > KDBUS_MSG_MAX_FDS)
return -EMFILE;
- kmsg->fds = kcalloc(n, sizeof(struct file *),
- GFP_KERNEL);
+ kmsg->fds = kcalloc(n, sizeof(*kmsg->fds), GFP_KERNEL);
if (!kmsg->fds)
return -ENOMEM;