[linux-yocto] [PATCH 23/52] drivers/net/ethernet/lsi: Fix Compiler Warnings

[Daniel Dragomir]

From: John Jacques <john.jacques at lsi.com>

Fixes compilation warnings introduced by:
- LSI FEMAC Ethernet Driver
  commit 3a99fb32b9aee41fc6d30c2ebf68c3cf73a443ce
  author: David Mercado
-  arm/include: A clean up of the femac code.
  commit 4ab937c6b46316531bdf9f099553393fa9406769
  author: John Jacques

See below the warning messages:

drivers/net/ethernet/lsi/lsi_acp_net.h: In function 'femac_uncache':
drivers/net/ethernet/lsi/lsi_acp_net.h:521:2: warning: passing argument
2 of '__raw_writel' makes pointer from integer without a cast [enabled
by default]
  writel(0x0, GPREG_HPROT_FEMAC);

drivers/net/ethernet/lsi/lsi_acp_net.c: In function
'appnic_handle_link_change':
drivers/net/ethernet/lsi/lsi_acp_net.c:190:3: warning: passing argument
1 of '__raw_readl' makes pointer from integer without a cast [enabled by
default]
   if (rx_configuration != read_mac(APPNIC_RX_CONF))

arch/arm/include/asm/io.h:88:20:
note: expected 'volatile void *' but argument is of type 'long unsigned
int'
 static inline void __raw_writel(u32 val, volatile void __iomem *addr)

include/uapi/linux/byteorder/little_endian.h:32:51: note: in definition
of macro '__cpu_to_le32'
 #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))

Signed-off-by: John Jacques <john.jacques at lsi.com>
---
 drivers/net/ethernet/lsi/lsi_acp_net.c | 6 ++++--
 drivers/net/ethernet/lsi/lsi_acp_net.h | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/lsi/lsi_acp_net.c b/drivers/net/ethernet/lsi/lsi_acp_net.c
index a46e850..69dcbc9 100644
--- a/drivers/net/ethernet/lsi/lsi_acp_net.c
+++ b/drivers/net/ethernet/lsi/lsi_acp_net.c
@@ -1543,8 +1543,10 @@ int appnic_init(struct net_device *dev)
 	write_mac(0x40010000, APPNIC_DMA_PCI_CONTROL);
 	write_mac(0x30000, APPNIC_DMA_CONTROL);
 #ifdef CONFIG_ARM
-	writel(0x280044, (unsigned long)pdata->dma_base + 0x60);
-	writel(0xc0, (unsigned long)pdata->dma_base + 0x64);
+	writel(0x280044,
+	       (void __iomem *)((unsigned long)pdata->dma_base + 0x60));
+	writel(0xc0,
+	       (void __iomem *)((unsigned long)pdata->dma_base + 0x64));
 #else
 	out_le32((unsigned *)pdata->dma_base + 0x60, 0x280044);
 	out_le32((unsigned *)pdata->dma_base + 0x64, 0xc0);
diff --git a/drivers/net/ethernet/lsi/lsi_acp_net.h b/drivers/net/ethernet/lsi/lsi_acp_net.h
index c1f4311..b943cd0 100644
--- a/drivers/net/ethernet/lsi/lsi_acp_net.h
+++ b/drivers/net/ethernet/lsi/lsi_acp_net.h
@@ -488,8 +488,8 @@ struct appnic_device {
 
 #ifdef CONFIG_ARM
 
-#define read_mac(address)         readl((address))
-#define write_mac(value, address) writel((value), (address))
+#define read_mac(address)         readl((void __iomem *)(address))
+#define write_mac(value, address) writel((value), (void __iomem *)(address))
 
 static inline void
 readdescriptor(unsigned long address, struct appnic_dma_descriptor *descriptor)
@@ -518,7 +518,7 @@ static inline void
 femac_uncache(struct appnic_device *pdata)
 {
 	/* Set FEMAC to uncached */
-	writel(0x0, GPREG_HPROT_FEMAC);
+	writel(0x0, (void __iomem *)GPREG_HPROT_FEMAC);
 }
 
 #else
-- 
1.8.1.4