From patchwork Thu Mar 24 08:36:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yevgeny Petrilin X-Patchwork-Id: 88144 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 44D091007D1 for ; Thu, 24 Mar 2011 19:36:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933743Ab1CXIgc (ORCPT ); Thu, 24 Mar 2011 04:36:32 -0400 Received: from mail.mellanox.co.il ([194.90.237.43]:54778 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933713Ab1CXIga (ORCPT ); Thu, 24 Mar 2011 04:36:30 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yevgenyp@mellanox.co.il) with SMTP; 24 Mar 2011 10:36:27 +0200 Received: from vnc1.lab.mtl.com (10.4.45.1) by MTLCAS01.mtl.com (10.0.8.70) with Microsoft SMTP Server id 14.1.270.1; Thu, 24 Mar 2011 10:36:27 +0200 Message-ID: <4D8B028B.8050406@mellanox.co.il> Date: Thu, 24 Mar 2011 10:36:27 +0200 From: Yevgeny Petrilin User-Agent: Thunderbird 2.0.0.17 (X11/20080914) MIME-Version: 1.0 To: CC: , Subject: [PATCH] mlx4_en: Removing HW info from ethtool -i report. X-Originating-IP: [10.4.45.1] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Avoiding abuse of ethtool_drvinfo.driver field. HW specific info can be retrieved using lspci. Signed-off-by: Yevgeny Petrilin --- drivers/net/mlx4/en_ethtool.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/drivers/net/mlx4/en_ethtool.c b/drivers/net/mlx4/en_ethtool.c index 62ace6c..d54b7ab 100644 --- a/drivers/net/mlx4/en_ethtool.c +++ b/drivers/net/mlx4/en_ethtool.c @@ -45,20 +45,7 @@ mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_dev *mdev = priv->mdev; - switch (mdev->dev->rev_id) { - case 0xa0: - if (dev->dev_id >= MLX4_EN_CX3_LOW_ID && dev->dev_id <= MLX4_EN_CX3_HIGH_ID) - sprintf(drvinfo->driver, DRV_NAME " (%s_CX-3)", mdev->dev->board_id); - else - sprintf(drvinfo->driver, DRV_NAME " (%s_CX)", mdev->dev->board_id); - break; - case 0xb0: - sprintf(drvinfo->driver, DRV_NAME " (%s_CX-2)", mdev->dev->board_id); - break; - default: - sprintf(drvinfo->driver, DRV_NAME " (%s)", mdev->dev->board_id); - break; - } + strncpy(drvinfo->driver, DRV_NAME, 32); strncpy(drvinfo->version, DRV_VERSION " (" DRV_RELDATE ")", 32); sprintf(drvinfo->fw_version, "%d.%d.%d", (u16) (mdev->dev->caps.fw_ver >> 32),