From patchwork Wed Jun 5 21:16:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2674301 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A622440077 for ; Wed, 5 Jun 2013 21:16:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932434Ab3FEVQq (ORCPT ); Wed, 5 Jun 2013 17:16:46 -0400 Received: from mail-la0-f53.google.com ([209.85.215.53]:59935 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932374Ab3FEVQo (ORCPT ); Wed, 5 Jun 2013 17:16:44 -0400 Received: by mail-la0-f53.google.com with SMTP id fs12so430935lab.12 for ; Wed, 05 Jun 2013 14:16:43 -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=EvBXewY6VxKMtvlBPywdTC0nFOsg6GeJU+kFcQFEXhc=; b=Xl3dh2jd20Z6pIuwYGzVHtTfvy9TZCbkYmiRmSQGGVguO/sNP12V0068pQ5UbDLw4Y +8vZnhoDv9iAYJYFHkvXlvJu7T0UyqaV/mlcRPCtAz3ZOkDDf7bgY+0Xg104n6vkmgDd l9Cj7Wirz9MhL3obP0OnVQsHWFxZNVsRO0LeoP+IPL5Mly2e/6lkJ77TkDwP3Z1vna1k XtQaz1AKIYA/yDWg3NXB0hJmy9FetwcaegNLfWbbzpODvVys/oIHuZsjpUnb7Cjnpjp4 BvxvbAh/lA90UP6XIE8C0etUA8JjwJMYpYe1UqB+FLv0ChBZf2NF2un3PoHVeXeUE94X j2HQ== X-Received: by 10.112.21.234 with SMTP id y10mr16066028lbe.53.1370467002903; Wed, 05 Jun 2013 14:16:42 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-76-88-205.pppoe.mtu-net.ru. [91.76.88.205]) by mx.google.com with ESMTPSA id e3sm27626155lbf.17.2013.06.05.14.16.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 05 Jun 2013 14:16:42 -0700 (PDT) From: Sergei Shtylyov Organization: Cogent Embedded To: netdev@vger.kernel.org Subject: [PATCH v4 6/8] sh_eth: remove #ifdef around sh_eth_select_mii() Date: Thu, 6 Jun 2013 01:16:47 +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: <201306060106.51082.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201306060106.51082.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Message-Id: <201306060116.48096.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQnAUF9Na+eZ5YPVMBUYyWDPyA+EEC5HEtUtDfjhtCFEdEHcH5Mimg1b+04TNUUw8aF+wpDP Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Nobuhiro Iwamatsu We can simply remove #ifdef'fery around sh_eth_select_mii(). We have to annotate it with '__maybe_unused' then. Signed-off-by: Nobuhiro Iwamatsu [Sergei: added the changelog, reworded the subject, changing the prefix.] Signed-off-by: Sergei Shtylyov --- Changes in version 4: - refreshed the patch; - added the changelog; - reworded the subject, changing the prefix. Changes in version 3: - annotated sh_eth_select_mii() with '__maybe_unused'. drivers/net/ethernet/renesas/sh_eth.c | 6 +----- 1 file changed, 1 insertion(+), 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.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -313,10 +313,7 @@ static const u16 sh_eth_offset_fast_sh3_ [TSU_ADRL31] = 0x01fc, }; -#if defined(CONFIG_CPU_SUBTYPE_SH7734) || \ - defined(CONFIG_CPU_SUBTYPE_SH7763) || \ - defined(CONFIG_ARCH_R8A7740) -static void sh_eth_select_mii(struct net_device *ndev) +static void __maybe_unused sh_eth_select_mii(struct net_device *ndev) { u32 value = 0x0; struct sh_eth_private *mdp = netdev_priv(ndev); @@ -339,7 +336,6 @@ static void sh_eth_select_mii(struct net sh_eth_write(ndev, value, RMII_MII); } -#endif static void __maybe_unused sh_eth_set_duplex(struct net_device *ndev) {