From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch v2] net/fec: cleanup types in fec_get_mac() Date: Thu, 29 Aug 2013 11:25:14 +0300 Message-ID: <20130829082514.GB14334@elgon.mountain> References: <1377261869.3364.3.camel@bwh-desktop.uk.level5networks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Rob Herring , "David S. Miller" , Fabio Estevam , Frank Li , Jim Baxter , Fugang Duan , netdev@vger.kernel.org, Ben Hutchings , devicetree@vger.kernel.org, kernel-janitors@vger.kernel.org To: Grant Likely Return-path: Received: from aserp1040.oracle.com ([141.146.126.69]:20221 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752887Ab3H2IZd (ORCPT ); Thu, 29 Aug 2013 04:25:33 -0400 Content-Disposition: inline In-Reply-To: <1377261869.3364.3.camel@bwh-desktop.uk.level5networks.com> Sender: netdev-owner@vger.kernel.org List-ID: My static checker complains that on some arches unsigned longs can be 8 characters which is larger than the buffer is only 6 chars. Additionally, Ben Hutchings points out that the buffer actually holds big endian data and the buffer we are reading from is CPU endian. Signed-off-by: Dan Carpenter --- v2: fix endian annotations and reverse the beXX_to_cpu() calls so that they say cpu_to_beXX(). diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index fdf9307..0b12866 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1100,10 +1100,10 @@ static void fec_get_mac(struct net_device *ndev) * 4) FEC mac registers set by bootloader */ if (!is_valid_ether_addr(iap)) { - *((unsigned long *) &tmpaddr[0]) = - be32_to_cpu(readl(fep->hwp + FEC_ADDR_LOW)); - *((unsigned short *) &tmpaddr[4]) = - be16_to_cpu(readl(fep->hwp + FEC_ADDR_HIGH) >> 16); + *((__be32 *) &tmpaddr[0]) = + cpu_to_be32(readl(fep->hwp + FEC_ADDR_LOW)); + *((__be16 *) &tmpaddr[4]) = + cpu_to_be16(readl(fep->hwp + FEC_ADDR_HIGH) >> 16); iap = &tmpaddr[0]; }