From patchwork Fri Feb 6 00:09:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 5787651 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E39AEBF440 for ; Fri, 6 Feb 2015 00:09:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A33720270 for ; Fri, 6 Feb 2015 00:09:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 116B720259 for ; Fri, 6 Feb 2015 00:09:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753760AbbBFAJR (ORCPT ); Thu, 5 Feb 2015 19:09:17 -0500 Received: from mail-lb0-f175.google.com ([209.85.217.175]:63400 "EHLO mail-lb0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbbBFAJQ (ORCPT ); Thu, 5 Feb 2015 19:09:16 -0500 Received: by mail-lb0-f175.google.com with SMTP id n10so8867987lbv.6 for ; Thu, 05 Feb 2015 16:09:15 -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=vCEJzP4og7YSladCDAvSdaamgvLb5n7HmxXZyFsRuhY=; b=acnVifaKCowQIy6iI8sOnfsLHIlsZK+AXZW3qXes33Zcch8pdiLSf7au9Kbn+n6fsd iNYBkEsBtcL4i2TWrEkJzJhPBPSHw7IiyrsqCN2xyVSGOkgJ1bj/YnbayDINRgaYNc1F xVc58eWIG0JMdfzPSty8q9uzT9hv56SKTk0PQ= 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=vCEJzP4og7YSladCDAvSdaamgvLb5n7HmxXZyFsRuhY=; b=HJYCEieGY/D7hdkg/3723eWnHE0rpH7UyX4dsu+LY55cv+CeSTGaY1N9ZNdJnblS5z 0iPh2l/p4RLFkRaf7wPAKTw4UcLpj9UkNLGNMfL0GnJjRj/VniEazQW+DsAWP1lKzdpc UBUA0yAdGXi2H3OyeoclmOFTVSmEKLrhq2yn0cMlUD+5bSFqZw4JlBbl/n+Mg7Rp8iFz nhbjTPqATj3PI8T9sawEmqQspeivdbZgCrZSZaG6J2auSrYFqKK42yr5IMEdS3Rwt+ZJ aSlLpm2G7w3X4EL1kz8iVP+pHLb4CamYmVOYDVmNCEzzgnQsUx5Kb5enIQ/l5XkSAmKa AzSw== X-Gm-Message-State: ALoCoQl+z6wCyjcRRdcUPIQxrTYVgy5LbFLcWRGru8+2w11w6oYnvxVyWskRmeysSYtUrNMeWuZj X-Received: by 10.152.179.41 with SMTP id dd9mr546562lac.66.1423181355034; Thu, 05 Feb 2015 16:09:15 -0800 (PST) Received: from spencer.imf.au.dk ([130.225.20.51]) by mx.google.com with ESMTPSA id sf2sm119240lbb.30.2015.02.05.16.09.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Feb 2015 16:09:14 -0800 (PST) From: Rasmus Villemoes To: Faisal Latif , Roland Dreier , Sean Hefty , Hal Rosenstock Cc: Rasmus Villemoes , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] infiniband: nes: Remove duplicate function names Date: Fri, 6 Feb 2015 01:09:04 +0100 Message-Id: <1423181345-18449-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The macro nes_debug already ensures that __func__ (and __LINE__) is part of the output, so there's no reason to duplicate the function name in the format string itself. Signed-off-by: Rasmus Villemoes --- drivers/infiniband/hw/nes/nes.c | 2 +- drivers/infiniband/hw/nes/nes_cm.c | 8 ++++---- drivers/infiniband/hw/nes/nes_verbs.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 3b2a6dc8ea99..65665bdd6c51 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c @@ -148,7 +148,7 @@ static int nes_inetaddr_event(struct notifier_block *notifier, struct nes_vnic *nesvnic; unsigned int is_bonded; - nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address %pI4, netmask %pI4.\n", + nes_debug(NES_DBG_NETDEV, "ip address %pI4, netmask %pI4.\n", &ifa->ifa_address, &ifa->ifa_mask); list_for_each_entry(nesdev, &nes_dev_list, list) { nes_debug(NES_DBG_NETDEV, "Nesdev list entry = 0x%p. (%s)\n", diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index 6f09a72e78d7..3a45f06d20e4 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c @@ -2270,7 +2270,7 @@ static void passive_open_err(struct nes_cm_node *cm_node, struct sk_buff *skb, cleanup_retrans_entry(cm_node); cm_node->state = NES_CM_STATE_CLOSED; if (reset) { - nes_debug(NES_DBG_CM, "passive_open_err sending RST for " + nes_debug(NES_DBG_CM, "sending RST for " "cm_node=%p state =%d\n", cm_node, cm_node->state); send_reset(cm_node, skb); } else { @@ -2319,7 +2319,7 @@ static void process_packet(struct nes_cm_node *cm_node, struct sk_buff *skb, skb_pull(skb, ip_hdr(skb)->ihl << 2); - nes_debug(NES_DBG_CM, "process_packet: cm_node=%p state =%d syn=%d " + nes_debug(NES_DBG_CM, "cm_node=%p state =%d syn=%d " "ack=%d rst=%d fin=%d\n", cm_node, cm_node->state, tcph->syn, tcph->ack, tcph->rst, tcph->fin); @@ -3218,7 +3218,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) adapter = nesdev->nesadapter; cm_node = (struct nes_cm_node *)cm_id->provider_data; - nes_debug(NES_DBG_CM, "nes_accept: cm_node= %p nesvnic=%p, netdev=%p," + nes_debug(NES_DBG_CM, "cm_node= %p nesvnic=%p, netdev=%p," "%s\n", cm_node, nesvnic, nesvnic->netdev, nesvnic->netdev->name); @@ -3745,7 +3745,7 @@ static void cm_event_connected(struct nes_cm_event *event) /* get all our handles */ cm_node = event->cm_node; cm_id = cm_node->cm_id; - nes_debug(NES_DBG_CM, "cm_event_connected - %p - cm_id = %p\n", cm_node, cm_id); + nes_debug(NES_DBG_CM, "%p - cm_id = %p\n", cm_node, cm_id); nesqp = (struct nes_qp *)cm_id->provider_data; nesvnic = to_nesvnic(nesqp->ibqp.device); nesdev = nesvnic->nesdev; diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index c0d0296e7a00..a8d73188c276 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c @@ -300,7 +300,7 @@ static int alloc_fast_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd, nes_debug(NES_DBG_MR, "Failed to get a cqp_request.\n"); return -ENOMEM; } - nes_debug(NES_DBG_MR, "alloc_fast_reg_mr: page_count = %d, " + nes_debug(NES_DBG_MR, "page_count = %d, " "region_length = %llu\n", page_count, region_length); cqp_request->waiting = 1;