From patchwork Thu Apr 18 07:01:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 237462 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 809F32C01D1 for ; Thu, 18 Apr 2013 17:02:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966032Ab3DRHCA (ORCPT ); Thu, 18 Apr 2013 03:02:00 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:44278 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965991Ab3DRHB7 (ORCPT ); Thu, 18 Apr 2013 03:01:59 -0400 Received: by mail-pd0-f170.google.com with SMTP id 10so1337162pdi.1 for ; Thu, 18 Apr 2013 00:01:58 -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=CGG70lNWx+4olTXTYR6C53kdkHNtZ/X5ntjNpPj+sIY=; b=YMcsFBzsg9E9IoMXbVB/Tm6qwGqQ1Lrv+nZUDQUDf82D45FR+9asnL+esdFhe8YHpW 7PoFVJaTFIOHTXSkF15mozMhoCd5AMWATTwbzrHDj1g5zYU53XgUPsa0X6+y/eNeNb8L vvKtHfJq0gLbYujYlC6z2TT7whOeUkqWKYegDIcnpzYgb5uuwrNTLGevVuTPnYrkY689 XkkGBFN+uMXBg8WwqTfRaBOkCU82CkNn6nla2uq/8CL67a/DH8UeitbIIpwZsc7M+oJw zreGv96LPCKyijt7kNHGCJXnThgda8dTzA2CNYVLqlNZlK+PvexbVzX2Ut/9RzGyWz/8 D7pQ== X-Received: by 10.66.27.52 with SMTP id q20mr11962434pag.211.1366268518855; Thu, 18 Apr 2013 00:01:58 -0700 (PDT) Received: from xps-iwamatsu.renesas.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPS id ba10sm8838249pbd.21.2013.04.18.00.01.56 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 00:01:57 -0700 (PDT) From: Nobuhiro Iwamatsu To: netdev@vger.kernel.org Cc: yoshihiro.shimoda.uh@renesas.com, Nobuhiro Iwamatsu Subject: [PATCH 1/8] net: sh-eth: Remove ifdef from definition of bit of EDSR and GECMR Date: Thu, 18 Apr 2013 16:01:43 +0900 Message-Id: <1366268510-8121-1-git-send-email-nobuhiro.iwamatsu.yj@renesas.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnwxRRU174LKIJ/DZjTQcZxIc7nMuBNQQcL86rN5DtdYt/fa2DJWxWLLrqXMo39QpPPaAy8 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Nobuhiro Iwamatsu --- 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 6f9a997..f86ea96 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, sh7764, sh7757 and r8a7740 only */ enum EDSR_BIT { EDSR_ENT = 0x01, EDSR_ENR = 0x02, }; #define EDSR_ENALL (EDSR_ENT|EDSR_ENR) -/* GECMR */ +/* GECMR : sh7734, sh7764 and r8a7740 only */ enum GECMR_BIT { GECMR_10 = 0x0, GECMR_100 = 0x04, GECMR_1000 = 0x01, }; -#endif /* EDMR */ enum DMAC_M_BIT {