From patchwork Thu Jun 3 11:24:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junchang Wang X-Patchwork-Id: 54480 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 A2352B7D47 for ; Thu, 3 Jun 2010 21:24:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751250Ab0FCLYY (ORCPT ); Thu, 3 Jun 2010 07:24:24 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:61304 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970Ab0FCLYW (ORCPT ); Thu, 3 Jun 2010 07:24:22 -0400 Received: by pxi8 with SMTP id 8so410106pxi.19 for ; Thu, 03 Jun 2010 04:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mail-followup-to:mime-version:content-type :content-disposition:user-agent; bh=a/Iwpks1PabKqNKO3cTGM7TFdt0hOWlZKv/xF0CsuGg=; b=Iw0AWCyO6kf9jQMNjxK9+VQ/szwSMlL3F3mx5c4oN1FC+eBvxVi36GHfOnluFLKigm Rt1A/QXJMlEM4BmW1YvVqaHm6qE8O+OY1SroPmqtnRfIbwqjjat7obhqDZbXQQomEnZ7 +wuSDCXyHGfNVxP/eO0XmAZdJ2kvLN8xIG2Og= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-type:content-disposition:user-agent; b=UQAdbprFNq9NNx7v4z2k2ooXScSLwZDqKowqTrM7f1Udg2u8abtEq8pTcBRNaNsuWC 0DWWl3C8OPUCZVExLkH8B64BTW/uXIaf/JZr1o7bdKEgAh6ZCk6KsznYgAQ6UqQ8U22U p5o7epB8qdVlg/PDG8+xZJni0hCfj1JjVYIf0= Received: by 10.141.53.12 with SMTP id f12mr8041268rvk.142.1275564262280; Thu, 03 Jun 2010 04:24:22 -0700 (PDT) Received: from host-a-55.ustcsz.edu.cn ([58.211.218.74]) by mx.google.com with ESMTPS id b1sm133898rvn.14.2010.06.03.04.24.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Jun 2010 04:24:21 -0700 (PDT) Date: Thu, 3 Jun 2010 19:24:30 +0800 From: Junchang Wang To: romieu@fr.zoreil.com Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [Patch 1/2]r8169: remove rtl_rw_cpluscmd Message-ID: <20100603112428.GC24909@host-a-55.ustcsz.edu.cn> Mail-Followup-To: romieu@fr.zoreil.com, davem@davemloft.net, netdev@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some clean up work. Please correct me if any of this is wrong. Writting "cmd" back without modification is redundant. Secondly, because rtl_rw_cpluscmd is just encapsulation of RTL_R16, remove rtl_rw_cpluscmd. Signed-off-by: Junchang Wang --- drivers/net/r8169.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) 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/r8169.c b/drivers/net/r8169.c index 217e709..6a37813 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -3404,15 +3404,6 @@ static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp, RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_BIT_MASK(32)); } -static u16 rtl_rw_cpluscmd(void __iomem *ioaddr) -{ - u16 cmd; - - cmd = RTL_R16(CPlusCmd); - RTL_W16(CPlusCmd, cmd); - return cmd; -} - static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz) { /* Low hurts. Let's disable the filtering. */ @@ -3471,7 +3462,7 @@ static void rtl_hw_start_8169(struct net_device *dev) (tp->mac_version == RTL_GIGA_MAC_VER_04)) rtl_set_rx_tx_config_registers(tp); - tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW; + tp->cp_cmd |= RTL_R16(CPlusCmd) | PCIMulRW; if ((tp->mac_version == RTL_GIGA_MAC_VER_02) || (tp->mac_version == RTL_GIGA_MAC_VER_03)) { @@ -3906,7 +3897,7 @@ static void rtl_hw_start_8101(struct net_device *dev) rtl_set_rx_max_size(ioaddr, tp->rx_buf_sz); - tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW; + tp->cp_cmd |= RTL_R16(CPlusCmd) | PCIMulRW; RTL_W16(CPlusCmd, tp->cp_cmd); -- -- To unsubscribe from this list: send the line "unsubscribe netdev" in