From 2321bfe425385494da8739d7d7e9dd3a5ca18a84 Mon Sep 17 00:00:00 2001 From: "andreas.devel@googlemail.com" Date: Thu, 9 Jun 2011 00:22:54 +0000 Subject: at91_emac: fix compile warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch removes the warning ---8<--- at91_emac.c: In function 'at91emac_write_hwaddr': at91_emac.c:487:2: warning: dereferencing type-punned pointer will break strict-aliasing rules --->8--- Signed-off-by: Andreas Bießmann --- drivers/net/at91_emac.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'drivers') diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index b09ff8c4d1..97d273999a 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -481,11 +481,13 @@ static int at91emac_write_hwaddr(struct eth_device *netdev) dev = (emac_device *) netdev->priv; writel(1 << ATMEL_ID_EMAC, &pmc->pcer); - DEBUG_AT91EMAC("init MAC-ADDR %x%x \n", - cpu_to_le16(*((u16 *)(netdev->enetaddr + 4))), - cpu_to_le32(*((u32 *)netdev->enetaddr))); - writel(cpu_to_le32(*((u32 *)netdev->enetaddr)), &emac->sa2l); - writel(cpu_to_le16(*((u16 *)(netdev->enetaddr + 4))), &emac->sa2h); + DEBUG_AT91EMAC("init MAC-ADDR %02x:%02x:%02x:%02x:%02x:%02x\n", + netdev->enetaddr[5], netdev->enetaddr[4], netdev->enetaddr[3], + netdev->enetaddr[2], netdev->enetaddr[1], netdev->enetaddr[0]); + writel( (netdev->enetaddr[0] | netdev->enetaddr[1] << 8 | + netdev->enetaddr[2] << 16 | netdev->enetaddr[3] << 24), + &emac->sa2l); + writel((netdev->enetaddr[4] | netdev->enetaddr[5] << 8), &emac->sa2h); DEBUG_AT91EMAC("init MAC-ADDR %x%x \n", readl(&emac->sa2h), readl(&emac->sa2l)); return 0; -- cgit v1.2.1