From patchwork Thu Jun 6 19:43:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2683281 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9F0AEDF23A for ; Thu, 6 Jun 2013 19:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753084Ab3FFTnN (ORCPT ); Thu, 6 Jun 2013 15:43:13 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:45542 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752160Ab3FFTnM (ORCPT ); Thu, 6 Jun 2013 15:43:12 -0400 Received: by mail-lb0-f171.google.com with SMTP id 13so239141lba.30 for ; Thu, 06 Jun 2013 12:43:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:organization:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id:x-gm-message-state; bh=Hn7Za98hjhJ6XOqLe/FbFmYRuRud+niv/U6rning1Sg=; b=eTUjBwCXT0otxXUyGIiDTX681AFySP0AJ8qT9HjJ34w6RtekTovTox/KLwirSHrhy4 A8kve4k8IzCoMQK1EcsOZjs7XjZl6zJFFTPuZDAKkBNMh7hmJC30kgK29Al1/5VKELNZ 4lwMWFh5JDKYs5jBOd+Sd3APBfVMpNjRevL/U6QGVWKgZ8rEribqfqZcKBBI7Bm+6tp9 verTdBWVTq6QzQNHhwmp56Ha8PqvhOUOw1WR5vXFveWjlsi7nh0uEbhkNoYOAfnYuqXy RDirhsBQRS+58rwOzv+/la7kxwer9bjcFi9l4JcXsRnqbtXQuAd+wlrkW3tR02XAWDxy NvIQ== X-Received: by 10.112.218.68 with SMTP id pe4mr555364lbc.40.1370547790604; Thu, 06 Jun 2013 12:43:10 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-148-37.pppoe.mtu-net.ru. [91.76.148.37]) by mx.google.com with ESMTPSA id x8sm3952965lae.10.2013.06.06.12.43.08 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 06 Jun 2013 12:43:09 -0700 (PDT) From: Sergei Shtylyov Organization: Cogent Embedded To: netdev@vger.kernel.org Subject: [PATCH v5 1/8] sh_eth: remove #ifdef around EDSR and GECMR bit definitions Date: Thu, 6 Jun 2013 23:43:16 +0400 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.i686.PAE; KDE/4.4.5; i686; ; ) Cc: nobuhiro.iwamatsu.yj@renesas.com, linux-sh@vger.kernel.org References: <201306062339.21353.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201306062339.21353.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Message-Id: <201306062343.16875.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQlVnkYmvtADJrypO/St2Kos6lXgQzWAhCi6CK0lIi7Elz4eaM0fi+FZxpCgcf5r2l8gCoOL Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Nobuhiro Iwamatsu Remove #ifdef around 'enum EDSR_BIT' and 'enum GECMR_BIT', replacing it with the comments on which SoCs these registers exist. SH7757 also has EDSR, so add a comment about it to 'enum EDSR_BIT'. Signed-off-by: Nobuhiro Iwamatsu [Sergei: folded in the former patch #2, updated the changelog, reworded the subject, changing the prefix.] Signed-off-by: Sergei Shtylyov --- Changes in version 5: - expanded the changelog. Changes in version 4: - folded in the former patch #2, updated the changelog accordingly; - reworded the subject, changing the prefix. Changes in version 3: - fix comment. drivers/net/ethernet/renesas/sh_eth.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: net-next/drivers/net/ethernet/renesas/sh_eth.h =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h +++ net-next/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, sh7757, 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 {