From patchwork Wed Nov 2 02:06:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenyou Yang X-Patchwork-Id: 690228 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3t7s254dbCz9t9b for ; Wed, 2 Nov 2016 13:07:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 05A4DA7581; Wed, 2 Nov 2016 03:07:56 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xf_Ed4-PLrxE; Wed, 2 Nov 2016 03:07:55 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A77D1A7548; Wed, 2 Nov 2016 03:07:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A8B45A7581 for ; Wed, 2 Nov 2016 03:07:51 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D9KT8XTwUS_u for ; Wed, 2 Nov 2016 03:07:51 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from ussmtp01.atmel.com (nasmtp01.atmel.com [192.199.1.246]) by theia.denx.de (Postfix) with ESMTPS id 167FEA7579 for ; Wed, 2 Nov 2016 03:07:47 +0100 (CET) Received: from apsmtp01.atmel.com (10.168.254.31) by DVREDG02.corp.atmel.com (10.42.103.31) with Microsoft SMTP Server (TLS) id 14.3.235.1; Tue, 1 Nov 2016 20:07:40 -0600 Received: from shaarm01.corp.atmel.com (10.168.254.13) by apsmtp01.atmel.com (10.168.254.31) with Microsoft SMTP Server id 14.3.235.1; Wed, 2 Nov 2016 10:08:54 +0800 From: Wenyou Yang To: U-Boot Mailing List Date: Wed, 2 Nov 2016 10:06:57 +0800 Message-ID: <1478052417-4767-4-git-send-email-wenyou.yang@atmel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478052417-4767-1-git-send-email-wenyou.yang@atmel.com> References: <1478052417-4767-1-git-send-email-wenyou.yang@atmel.com> MIME-Version: 1.0 Cc: Joe Hershberger Subject: [U-Boot] [PATCH v2 3/3] net: macb: Remove redundant #ifdef CONFIG_DM_ETH X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Remove the redundant #ifdef CONFIG_DM_ETH/#endif. Signed-off-by: Wenyou Yang Acked-by: Joe Hershberger --- Changes in v2: - Add Acked-by tag. drivers/net/macb.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index f97b82a..67d820f 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1030,8 +1030,6 @@ static int macb_eth_probe(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); struct macb_device *macb = dev_get_priv(dev); - -#ifdef CONFIG_DM_ETH const char *phy_mode; int ret; @@ -1042,7 +1040,6 @@ static int macb_eth_probe(struct udevice *dev) debug("%s: Invalid PHY interface '%s'\n", __func__, phy_mode); return -EINVAL; } -#endif macb->regs = (void *)pdata->iobase;