From patchwork Fri Aug 16 23:07:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Wu X-Patchwork-Id: 267928 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 C31F82C0296 for ; Sat, 17 Aug 2013 10:00:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754215Ab3HQAAb (ORCPT ); Fri, 16 Aug 2013 20:00:31 -0400 Received: from mail-ee0-f48.google.com ([74.125.83.48]:48600 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754204Ab3HQAAa (ORCPT ); Fri, 16 Aug 2013 20:00:30 -0400 Received: by mail-ee0-f48.google.com with SMTP id l10so1165754eei.35 for ; Fri, 16 Aug 2013 17:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DIE5mRelcSAh83c0hsohMcZRIc7+ZnptEclbDUrA4TA=; b=n84rw/gRjytIcBtCAstTX1VuAW+bRB9Os5vx6L3eKKui+ZEb//6B8uuIAPu9N62+rD 5pmIsyzlETTUipaC7nfQrP57ZIHZ53CpHYU4eWcQTuR4LmYFpC489Z5b8FtaW1z9EQbA dhbI/6fQjtstUkC8iMLRk3FHQ8HK1h7Oy/9Vz0HwKqIxPbG1ZpMAguK3Qfs/WRzl3PrB f2gKDby2caijtAaRXgV9UI0acwG0VcvBpD487fZPJq5Oq1zw2aa4tI+nX4gBfI9uDXd8 6FoqiBBDKhwkru8Ia/9dgQxkiYgP5aDrYS3/+C4KqV5RCJEhMYjgfU8qK685sfe3CLVP hTlA== X-Received: by 10.15.63.75 with SMTP id l51mr76410eex.32.1376694477949; Fri, 16 Aug 2013 16:07:57 -0700 (PDT) Received: from localhost.localdomain (ip4da018ae.direct-adsl.nl. [77.160.24.174]) by mx.google.com with ESMTPSA id r48sm47869eev.14.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 16:07:56 -0700 (PDT) From: Peter Wu To: Ben Hutchings , Francois Romieu Cc: lekensteyn@gmail.com, netdev@vger.kernel.org Subject: [PATCH] r8169,sis190: remove unnecessary length check Date: Sat, 17 Aug 2013 01:07:53 +0200 Message-Id: <1376694473-8517-1-git-send-email-lekensteyn@gmail.com> X-Mailer: git-send-email 1.8.3.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The ethtool core will lower the requested length to the one returned by get_regs_len, therefore no additional check is needed in the get_regs function. Reported-by: Ben Hutchings Signed-off-by: Peter Wu --- Hi, This was observed by Ben[1] while reviewing my other r8169 register dump patch. I have combined the r8169 and sis190 patches since they were trivial and both maintained by Francois. Let me know if you prefer to split this trivial patch up. Regards, Peter [1]: http://www.spinics.net/lists/netdev/msg246690.html --- drivers/net/ethernet/realtek/r8169.c | 3 --- drivers/net/ethernet/sis/sis190.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index b5eb419..93ee49d 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1898,9 +1898,6 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, { struct rtl8169_private *tp = netdev_priv(dev); - if (regs->len > R8169_REGS_SIZE) - regs->len = R8169_REGS_SIZE; - rtl_lock_work(tp); memcpy_fromio(p, tp->mmio_addr, regs->len); rtl_unlock_work(tp); diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c index 02df089..ee18e6f 100644 --- a/drivers/net/ethernet/sis/sis190.c +++ b/drivers/net/ethernet/sis/sis190.c @@ -1770,9 +1770,6 @@ static void sis190_get_regs(struct net_device *dev, struct ethtool_regs *regs, struct sis190_private *tp = netdev_priv(dev); unsigned long flags; - if (regs->len > SIS190_REGS_SIZE) - regs->len = SIS190_REGS_SIZE; - spin_lock_irqsave(&tp->lock, flags); memcpy_fromio(p, tp->mmio_addr, regs->len); spin_unlock_irqrestore(&tp->lock, flags);