Commit 01d0a9b4 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

staging: slicoss: Remove dma_addr_t cast compilation warnings

Eliminate some warnings by casting to unsigned long before
casting a dma_addr_t value to a pointer.

btw:

Does slicoss always work on x86-32?
Is a pshmem guaranteed to be accessible
by a 32 bit address?
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f1bf4ba
...@@ -999,7 +999,8 @@ static void slic_link_upr_complete(struct adapter *adapter, u32 isr) ...@@ -999,7 +999,8 @@ static void slic_link_upr_complete(struct adapter *adapter, u32 isr)
if ((isr & ISR_UPCERR) || (isr & ISR_UPCBSY)) { if ((isr & ISR_UPCERR) || (isr & ISR_UPCBSY)) {
struct slic_shmem *pshmem; struct slic_shmem *pshmem;
pshmem = (struct slic_shmem *)adapter->phys_shmem; pshmem = (struct slic_shmem *)(unsigned long)
adapter->phys_shmem;
#if BITS_PER_LONG == 64 #if BITS_PER_LONG == 64
slic_upr_queue_request(adapter, slic_upr_queue_request(adapter,
SLIC_UPR_RLSR, SLIC_UPR_RLSR,
...@@ -1631,10 +1632,11 @@ static int slic_rcvqueue_fill(struct adapter *adapter) ...@@ -1631,10 +1632,11 @@ static int slic_rcvqueue_fill(struct adapter *adapter)
#endif #endif
skb = alloc_skb(SLIC_RCVQ_RCVBUFSIZE, GFP_ATOMIC); skb = alloc_skb(SLIC_RCVQ_RCVBUFSIZE, GFP_ATOMIC);
if (skb) { if (skb) {
paddr = (void *)pci_map_single(adapter->pcidev, paddr = (void *)(unsigned long)
skb->data, pci_map_single(adapter->pcidev,
SLIC_RCVQ_RCVBUFSIZE, skb->data,
PCI_DMA_FROMDEVICE); SLIC_RCVQ_RCVBUFSIZE,
PCI_DMA_FROMDEVICE);
paddrl = SLIC_GET_ADDR_LOW(paddr); paddrl = SLIC_GET_ADDR_LOW(paddr);
paddrh = SLIC_GET_ADDR_HIGH(paddr); paddrh = SLIC_GET_ADDR_HIGH(paddr);
...@@ -1781,8 +1783,9 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb) ...@@ -1781,8 +1783,9 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)
struct slic_rcvbuf *rcvbuf = (struct slic_rcvbuf *)skb->head; struct slic_rcvbuf *rcvbuf = (struct slic_rcvbuf *)skb->head;
struct device *dev; struct device *dev;
paddr = (void *)pci_map_single(adapter->pcidev, skb->head, paddr = (void *)(unsigned long)
SLIC_RCVQ_RCVBUFSIZE, PCI_DMA_FROMDEVICE); pci_map_single(adapter->pcidev, skb->head,
SLIC_RCVQ_RCVBUFSIZE, PCI_DMA_FROMDEVICE);
rcvbuf->status = 0; rcvbuf->status = 0;
skb->next = NULL; skb->next = NULL;
...@@ -2279,7 +2282,7 @@ static void slic_link_event_handler(struct adapter *adapter) ...@@ -2279,7 +2282,7 @@ static void slic_link_event_handler(struct adapter *adapter)
return; return;
} }
pshmem = (struct slic_shmem *)adapter->phys_shmem; pshmem = (struct slic_shmem *)(unsigned long)adapter->phys_shmem;
#if BITS_PER_LONG == 64 #if BITS_PER_LONG == 64
status = slic_upr_request(adapter, status = slic_upr_request(adapter,
...@@ -2306,7 +2309,7 @@ static void slic_init_cleanup(struct adapter *adapter) ...@@ -2306,7 +2309,7 @@ static void slic_init_cleanup(struct adapter *adapter)
sizeof(struct slic_shmem), sizeof(struct slic_shmem),
adapter->pshmem, adapter->phys_shmem); adapter->pshmem, adapter->phys_shmem);
adapter->pshmem = NULL; adapter->pshmem = NULL;
adapter->phys_shmem = (dma_addr_t) NULL; adapter->phys_shmem = (dma_addr_t)(unsigned long)NULL;
} }
if (adapter->pingtimerset) { if (adapter->pingtimerset) {
...@@ -2880,7 +2883,8 @@ static int slic_if_init(struct adapter *adapter) ...@@ -2880,7 +2883,8 @@ static int slic_if_init(struct adapter *adapter)
mdelay(1); mdelay(1);
if (!adapter->isp_initialized) { if (!adapter->isp_initialized) {
pshmem = (struct slic_shmem *)adapter->phys_shmem; pshmem = (struct slic_shmem *)(unsigned long)
adapter->phys_shmem;
spin_lock_irqsave(&adapter->bit64reglock.lock, spin_lock_irqsave(&adapter->bit64reglock.lock,
adapter->bit64reglock.flags); adapter->bit64reglock.flags);
...@@ -3282,7 +3286,8 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) ...@@ -3282,7 +3286,8 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
} }
slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH); slic_reg32_write(&slic_regs->slic_icr, ICR_INT_OFF, FLUSH);
mdelay(1); mdelay(1);
pshmem = (struct slic_shmem *)adapter->phys_shmem; pshmem = (struct slic_shmem *)(unsigned long)
adapter->phys_shmem;
spin_lock_irqsave(&adapter->bit64reglock.lock, spin_lock_irqsave(&adapter->bit64reglock.lock,
adapter->bit64reglock.flags); adapter->bit64reglock.flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment