From patchwork Thu Jun 6 19:50:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2683351 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 B8DBCDF23A for ; Thu, 6 Jun 2013 19:50:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753194Ab3FFTu1 (ORCPT ); Thu, 6 Jun 2013 15:50:27 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:62346 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752871Ab3FFTu0 (ORCPT ); Thu, 6 Jun 2013 15:50:26 -0400 Received: by mail-la0-f44.google.com with SMTP id er20so2993295lab.17 for ; Thu, 06 Jun 2013 12:50:25 -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=Bj8H65Kz4+5jiBE3LvKgUWq/uCrpTQGljTFtF/okbacDHNL1QOd1SMc4RNkDtuSENm JBnY3tluf9MHdlXYGQ7LqpJOm/o3Oo/vbh7aGa7gs7Yh0GOB6bjvKzfG6LlyKjHmtVD7 kg8xfIllNx/65XEEXallANGQ95kr2MvYk1woTHKdp9kSMwB1RYnzM5Ss//TEKxecabFz l1PBrC8Fg60htHTuw1s69luBNC+riyibrmyaSLUWXZTe7b3hAHe1r5DB1u98V8M2fGOP Hw2qrRc+Fx9IU+2XQn+4bwNreli867/CIboEEi4GqPo6PLNoeglGJ+lJ4jQMs2OzAUnh DXaQ== X-Received: by 10.152.5.197 with SMTP id u5mr873790lau.59.1370548224919; Thu, 06 Jun 2013 12:50:24 -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 n1sm580479lae.0.2013.06.06.12.50.23 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 06 Jun 2013 12:50:23 -0700 (PDT) From: Sergei Shtylyov Organization: Cogent Embedded To: netdev@vger.kernel.org Subject: [PATCH v5 6/8] sh_eth: remove #ifdef around sh_eth_select_mii() Date: Thu, 6 Jun 2013 23:50:30 +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: <201306062350.31232.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQlQ3UwZpEe563foxclCpbUheVxm5wS1AXyrncbPyZigtThP9862XH9CtiJrJfFWxpNyadNi 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) {