From: Guenter Roeck <linux@roeck-us.net>
To: "David S. Miller" <davem@davemloft.net>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>,
David Daney <david.daney@cavium.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree-discuss@lists.ozlabs.org,
Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 5/5] net/nxp/lpc_eth: Drop ifdef CONFIG_OF_NET
Date: Tue, 2 Apr 2013 12:35:11 -0700 [thread overview]
Message-ID: <1364931311-30603-6-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1364931311-30603-1-git-send-email-linux@roeck-us.net>
Since of_get_mac_address() is now declared even if CONFIG_OF_NET
is not configured, the ifdef is no longer necessary and can be
removed.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/net/ethernet/nxp/lpc_eth.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index efa29b7..99276d7 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1434,13 +1434,11 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
/* Get MAC address from current HW setting (POR state is all zeros) */
__lpc_get_mac(pldat, ndev->dev_addr);
-#ifdef CONFIG_OF_NET
if (!is_valid_ether_addr(ndev->dev_addr)) {
const char *macaddr = of_get_mac_address(pdev->dev.of_node);
if (macaddr)
memcpy(ndev->dev_addr, macaddr, ETH_ALEN);
}
-#endif
if (!is_valid_ether_addr(ndev->dev_addr))
eth_hw_addr_random(ndev);
--
1.7.9.7
next prev parent reply other threads:[~2013-04-02 19:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 19:35 [PATCH 0/5] Provide empty functions if OF_NET is not configured Guenter Roeck
2013-04-02 19:35 ` [PATCH 1/5] of_net.h: " Guenter Roeck
2013-04-02 19:35 ` [PATCH 2/5] net/cadence/at91_ether: Simplify OF dependencies Guenter Roeck
2013-04-02 19:35 ` [PATCH 3/5] net/cadence/macb: " Guenter Roeck
2013-04-02 19:35 ` [PATCH 4/5] net/freescale/fec: " Guenter Roeck
2013-04-02 19:35 ` Guenter Roeck [this message]
2013-04-02 20:44 ` [PATCH 0/5] Provide empty functions if OF_NET is not configured David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364931311-30603-6-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=davem@davemloft.net \
--cc=david.daney@cavium.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=rob.herring@calxeda.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox