summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/sun/sunbmac.h
diff options
context:
space:
mode:
authorTushar Dave <tushar.n.dave@oracle.com>2016-10-17 23:57:00 +0300
committerDavid S. Miller <davem@davemloft.net>2016-11-18 22:18:27 +0300
commit1a9bbccaf8182da368dae454b57dc1c55074d266 (patch)
tree8e7db148a769b34dcebe7dd5e32a094669e5de5b /drivers/net/ethernet/sun/sunbmac.h
parent266439c94df9e6aee3390c6e1cfdb645e566f704 (diff)
downloadlinux-1a9bbccaf8182da368dae454b57dc1c55074d266.tar.xz
sunbmac: Fix compiler warning
sunbmac uses '__u32' for dma handle while invoking kernel DMA APIs, instead of using dma_addr_t. This hasn't caused any 'incompatible pointer type' warning on SPARC because until now dma_addr_t is of type u32. However, recent changes in SPARC ATU (iommu) enables 64bit DMA and therefore dma_addr_t becomes of type u64. This makes 'incompatible pointer type' warnings inevitable. e.g. drivers/net/ethernet/sun/sunbmac.c: In function ‘bigmac_ether_init’: drivers/net/ethernet/sun/sunbmac.c:1166: warning: passing argument 3 of ‘dma_alloc_coherent’ from incompatible pointer type ./include/linux/dma-mapping.h:445: note: expected ‘dma_addr_t *’ but argument is of type ‘__u32 *’ This patch resolves above compiler warning. Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com> Reviewed-by: chris hyser <chris.hyser@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sun/sunbmac.h')
-rw-r--r--drivers/net/ethernet/sun/sunbmac.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sun/sunbmac.h b/drivers/net/ethernet/sun/sunbmac.h
index 06dd21707353..532fc56830cf 100644
--- a/drivers/net/ethernet/sun/sunbmac.h
+++ b/drivers/net/ethernet/sun/sunbmac.h
@@ -291,7 +291,7 @@ struct bigmac {
void __iomem *bregs; /* BigMAC Registers */
void __iomem *tregs; /* BigMAC Transceiver */
struct bmac_init_block *bmac_block; /* RX and TX descriptors */
- __u32 bblock_dvma; /* RX and TX descriptors */
+ dma_addr_t bblock_dvma; /* RX and TX descriptors */
spinlock_t lock;