From patchwork Sun Sep 23 13:12:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Merav Sicron X-Patchwork-Id: 186194 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 A8C632C008E for ; Sun, 23 Sep 2012 20:10:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752343Ab2IWKJz (ORCPT ); Sun, 23 Sep 2012 06:09:55 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:4586 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266Ab2IWKJy (ORCPT ); Sun, 23 Sep 2012 06:09:54 -0400 Received: from [10.9.200.131] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Sun, 23 Sep 2012 03:08:42 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Sun, 23 Sep 2012 03:09:41 -0700 Received: from lb-tlvb-meravs.il.broadcom.com ( lb-tlvb-meravs.il.broadcom.com [10.185.6.129]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id B404840FE3; Sun, 23 Sep 2012 03:09:40 -0700 (PDT) From: "Merav Sicron" To: davem@davemloft.net, netdev@vger.kernel.org, eilong@broadcom.com cc: "Merav Sicron" Subject: [net-next patch v2] bnx2x: Improve code around bnx2x_tests_str_arr Date: Sun, 23 Sep 2012 15:12:23 +0200 Message-ID: <1348405943-32605-1-git-send-email-meravs@broadcom.com> X-Mailer: git-send-email 1.7.10 MIME-Version: 1.0 X-WSS-ID: 7C4000203MK37751099-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch changes the definition of bnx2x_tests_str_arr from static char pointer to static const char bi-directional array. Also the bnx2x_get_strings function is simplified. Reported-by: Joe Perches Reported-by: David Laight Signed-off-by: Merav Sicron Signed-off-by: Eilon Greenstein --- Hi, Sorry for the late response. Changes comparing to v1: Define the content of the array const, use bi-directional array instead of array with strings pointers, simplify the bnx2x_get_strings function by using memcpy. Dave, please consider applying this patch to net-next. Thanks, Merav drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 1.7.10 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index f923125..a19c9e0 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c @@ -1607,7 +1607,7 @@ static int bnx2x_set_pauseparam(struct net_device *dev, return 0; } -static char *bnx2x_tests_str_arr[BNX2X_NUM_TESTS_SF] = { +static const char bnx2x_tests_str_arr[BNX2X_NUM_TESTS_SF][ETH_GSTRING_LEN] = { "register_test (offline) ", "memory_test (offline) ", "int_loopback_test (offline)", @@ -2536,7 +2536,7 @@ static int bnx2x_get_sset_count(struct net_device *dev, int stringset) static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf) { struct bnx2x *bp = netdev_priv(dev); - int i, j, k, offset, start; + int i, j, k, start; char queue_name[MAX_QUEUE_NAME_LEN+1]; switch (stringset) { @@ -2572,13 +2572,8 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf) start = 0; else start = 4; - for (i = 0, j = start; j < (start + BNX2X_NUM_TESTS(bp)); - i++, j++) { - offset = sprintf(buf+32*i, "%s", - bnx2x_tests_str_arr[j]); - *(buf+offset) = '\0'; - } - break; + memcpy(buf, bnx2x_tests_str_arr + start, + ETH_GSTRING_LEN * BNX2X_NUM_TESTS(bp)); } }