2 files changed, 1 insertions, 3 deletions

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 4f55f9ce63fa..dac7f9b98687 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -383,7 +383,7 @@ static void con_sock_state_closed(struct ceph_connection *con)
  */
 
 /* data available on socket, or listen socket received a connect */
-static void ceph_sock_data_ready(struct sock *sk, int count_unused)
+static void ceph_sock_data_ready(struct sock *sk)
 {
         struct ceph_connection *con = sk->sk_user_data;
         if (atomic_read(&con->msgr->stopping)) {
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index b4157dc22199..b0dfce77656a 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2109,7 +2109,6 @@ bad:
         pr_err("osdc handle_map corrupt msg\n");
         ceph_msg_dump(msg);
         up_write(&osdc->map_sem);
-        return;
 }
 
 /*
@@ -2308,7 +2307,6 @@ done_err:
 
 bad:
         pr_err("osdc handle_watch_notify corrupt msg\n");
-        return;
 }
 
 /*