From patchwork Tue May 7 05:17:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 241966 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 75D102C0112 for ; Tue, 7 May 2013 15:18:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757118Ab3EGFSN (ORCPT ); Tue, 7 May 2013 01:18:13 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:57483 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756571Ab3EGFSL (ORCPT ); Tue, 7 May 2013 01:18:11 -0400 Received: by mail-pa0-f41.google.com with SMTP id rl6so222966pac.0 for ; Mon, 06 May 2013 22:18:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=M8vHM8HP1Uva7YN3d6nW4PW3dHEd9pMys04UV5YxVVY=; b=Hwg4TuLyhMXK9cRZCnrmZZzMBw/Ng+nf21A7VBNGhQMrMEx8lnSoOdseFVYek6rNNx CSsVw2PLXNWPPSUBtuRdYFhdPZ0fAETil7m5GKNLXTV2z0C+7tqPY5g0sk8IYx3QkXjU nW751Bn3lKpNYkTWDK4rPVbU5pk/FS3Oy4+fkabTb7TDRTG62hDAJp7ipdiX0ukK5RF4 Xivy6VDYXK7WC+JYZuKZRJoQ6PjqCVPk+chr8Wm093HMo/N+u3Jiy7XnpxruC32P8mh7 B1mdikrdKei35I2kq0G3PoguM5iS5duRpPAOaXRc4U0GZwe/1vEw1T39MX3WTaigzauW NZBQ== X-Received: by 10.66.233.167 with SMTP id tx7mr1114144pac.110.1367903890754; Mon, 06 May 2013 22:18:10 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id em2sm26775526pbb.0.2013.05.06.22.18.08 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 May 2013 22:18:09 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, sergei.shtylyov@cogentembedded.com, Nobuhiro Iwamatsu Subject: [PATCH v3 1/9] net: sh-eth: Remove ifdef from definition of bit of EDSR and GECMR Date: Tue, 7 May 2013 14:17:47 +0900 Message-Id: <1367903875-32606-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQkc6CLOWmwEAoL4yTueJC2XnAcPRLzP4pfkdguxSIXvz5YEJPiunSVs5JrwimfGU0yCYM5r Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Nobuhiro Iwamatsu --- V3: Fix comment. V2: no change. drivers/net/ethernet/renesas/sh_eth.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index 26cb8a0..7ccf58c 100644 --- a/drivers/net/ethernet/renesas/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h @@ -166,19 +166,16 @@ enum { /* * Register's bits */ -#if defined(CONFIG_CPU_SUBTYPE_SH7734) || defined(CONFIG_CPU_SUBTYPE_SH7763) ||\ - defined(CONFIG_ARCH_R8A7740) -/* EDSR */ +/* EDSR : sh7734, sh7763 and r8a7740 only */ enum EDSR_BIT { EDSR_ENT = 0x01, EDSR_ENR = 0x02, }; #define EDSR_ENALL (EDSR_ENT|EDSR_ENR) -/* GECMR */ +/* GECMR : sh7734, sh7763 and r8a7740 only */ enum GECMR_BIT { GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01, }; -#endif /* EDMR */ enum DMAC_M_BIT {