From patchwork Thu Feb 5 22:17:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 436969 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AD77C1401DC for ; Fri, 6 Feb 2015 09:18:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753624AbbBEWR4 (ORCPT ); Thu, 5 Feb 2015 17:17:56 -0500 Received: from mail-lb0-f178.google.com ([209.85.217.178]:42259 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751929AbbBEWRz (ORCPT ); Thu, 5 Feb 2015 17:17:55 -0500 Received: by mail-lb0-f178.google.com with SMTP id b6so5870730lbj.9 for ; Thu, 05 Feb 2015 14:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id; bh=e8OFbNvI3ypia0RFzvTfHbAXd3LS1fWK0RNds+bvP6g=; b=Jtc4A8hT1liR+aXJVtQDhtvoPTynwQjdUWQXT4vnoWh/N8H2iwv7FC124XHj4MCmxm cQ6uUl/bLDZOlZZhHi39Ljaz2lzWSdn2ZULia2MwYzvbyyHyjmU3uRUiiJ7LAg21Bzck 2+GTY72X9ROJ0AKpcskeJ6bH1sxwnKu8BtvHg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=e8OFbNvI3ypia0RFzvTfHbAXd3LS1fWK0RNds+bvP6g=; b=X8EGxvqYPXKgNWwGwgBvpc1raWpC3wOjZsc9WQNQ+WcJ70w5c+sxT8+flVoR3qe4LZ Y+CMD9vUNwthZMUSjub3wZFR3wXagmWeCrwqrVGP4gLu8ndeoGS/SAqlwZQmlbbI5Vhm 0YiacGbCjXoLfi8BCwZLeLBOauZqIFweDbQq108H1/LZH/i5e1cW+vQ6IHNRuXsInAyo u8powBLP9uNFJOAEAgRtNicUMqRm9n6lTxIF4DmhFk9PG/wtr82V5cVLS7ZZMlf0Av7+ 1sLi+PaxzIJmKG8EYCD4H4/qmr4cxDfPkbAAoXffhsrgfk2wQmTwKBcsxXTzGeQyp8uA Lj7Q== X-Gm-Message-State: ALoCoQm5E3P+rb9wvsSGzaUXQd0QlCHBk8TgABgUGiN7rQlYaIiQPgdrjYYynwT+KkNR2GiDvJCU X-Received: by 10.152.37.106 with SMTP id x10mr285900laj.52.1423174673894; Thu, 05 Feb 2015 14:17:53 -0800 (PST) Received: from spencer.imf.au.dk ([130.225.20.51]) by mx.google.com with ESMTPSA id v4sm88296lbz.12.2015.02.05.14.17.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Feb 2015 14:17:53 -0800 (PST) From: Rasmus Villemoes To: Chien Yen , "David S. Miller" Cc: Rasmus Villemoes , rds-devel@oss.oracle.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: rds: Remove repeated function names from debug output Date: Thu, 5 Feb 2015 23:17:20 +0100 Message-Id: <1423174641-11057-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The macro rdsdebug is defined as pr_debug("%s(): " fmt, __func__ , ##args) Hence it doesn't make sense to include the name of the calling function explicitly in the format string passed to rdsdebug. Signed-off-by: Rasmus Villemoes --- net/rds/ib_send.c | 4 ++-- net/rds/iw_cm.c | 4 ++-- net/rds/iw_send.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c index 1dde91e3dc70..bd3825d38abc 100644 --- a/net/rds/ib_send.c +++ b/net/rds/ib_send.c @@ -409,7 +409,7 @@ try_again: posted = IB_GET_POST_CREDITS(oldval); avail = IB_GET_SEND_CREDITS(oldval); - rdsdebug("rds_ib_send_grab_credits(%u): credits=%u posted=%u\n", + rdsdebug("wanted=%u credits=%u posted=%u\n", wanted, avail, posted); /* The last credit must be used to send a credit update. */ @@ -453,7 +453,7 @@ void rds_ib_send_add_credits(struct rds_connection *conn, unsigned int credits) if (credits == 0) return; - rdsdebug("rds_ib_send_add_credits(%u): current=%u%s\n", + rdsdebug("credits=%u current=%u%s\n", credits, IB_GET_SEND_CREDITS(atomic_read(&ic->i_credits)), test_bit(RDS_LL_SEND_FULL, &conn->c_flags) ? ", ll_send_full" : ""); diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c index a91e1db62ee6..a6c2bea9f8f9 100644 --- a/net/rds/iw_cm.c +++ b/net/rds/iw_cm.c @@ -590,8 +590,8 @@ void rds_iw_conn_shutdown(struct rds_connection *conn) /* Actually this may happen quite frequently, when * an outgoing connect raced with an incoming connect. */ - rdsdebug("rds_iw_conn_shutdown: failed to disconnect," - " cm: %p err %d\n", ic->i_cm_id, err); + rdsdebug("failed to disconnect, cm: %p err %d\n", + ic->i_cm_id, err); } if (ic->i_cm_id->qp) { diff --git a/net/rds/iw_send.c b/net/rds/iw_send.c index 9105ea03aec5..13834780a308 100644 --- a/net/rds/iw_send.c +++ b/net/rds/iw_send.c @@ -361,7 +361,7 @@ try_again: posted = IB_GET_POST_CREDITS(oldval); avail = IB_GET_SEND_CREDITS(oldval); - rdsdebug("rds_iw_send_grab_credits(%u): credits=%u posted=%u\n", + rdsdebug("wanted=%u credits=%u posted=%u\n", wanted, avail, posted); /* The last credit must be used to send a credit update. */ @@ -405,7 +405,7 @@ void rds_iw_send_add_credits(struct rds_connection *conn, unsigned int credits) if (credits == 0) return; - rdsdebug("rds_iw_send_add_credits(%u): current=%u%s\n", + rdsdebug("credits=%u current=%u%s\n", credits, IB_GET_SEND_CREDITS(atomic_read(&ic->i_credits)), test_bit(RDS_LL_SEND_FULL, &conn->c_flags) ? ", ll_send_full" : "");