[linux-yocto] [PATCH 28/35] drivers/net/ethernet/lsi: Fix Compiler Warnings
Bruce Ashfield
bruce.ashfield at windriver.com
Sun Nov 16 20:47:11 PST 2014
On 2014-11-13, 12:19 PM, Daniel Dragomir wrote:
> From: John Jacques <john.jacques at lsi.com>
.. and again!
Bruce
>
> 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
>
More information about the linux-yocto
mailing list