hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

farsync: Fix compile warnings. 

drivers/net/wan/farsync.c: In function 'fst_intr_rx':
drivers/net/wan/farsync.c:1312: warning: cast to pointer from integer of different size
drivers/net/wan/farsync.c: In function 'do_bottom_half_tx':
drivers/net/wan/farsync.c:1407: warning: cast to pointer from integer of different size

The "skb" and "mem" arguments being passed here are DMA addresses
being programmed into the hardware registers, so pass them as the type
that they actually are.  And use the correct printf formatting in
debug logging statements for these things to match the type change.

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2010-08-10 00:06:58 -07:00
parent c4e9b56e24
commit 5d337d6f64
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/wan/farsync.c
View File

@ -885,20 +885,21 @@ fst_rx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
* Receive a frame through the DMA * Receive a frame through the DMA
*/ */
static inline void static inline void
fst_rx_dma(struct fst_card_info *card, unsigned char *skb, fst_rx_dma(struct fst_card_info *card, dma_addr_t skb,
unsigned char *mem, int len) dma_addr_t mem, int len)
{ {
/* /*
* This routine will setup the DMA and start it * This routine will setup the DMA and start it
*/ */
dbg(DBG_RX, "In fst_rx_dma %p %p %d\n", skb, mem, len); dbg(DBG_RX, "In fst_rx_dma %lx %lx %d\n",
(unsigned long) skb, (unsigned long) mem, len);
if (card->dmarx_in_progress) { if (card->dmarx_in_progress) {
dbg(DBG_ASS, "In fst_rx_dma while dma in progress\n"); dbg(DBG_ASS, "In fst_rx_dma while dma in progress\n");
} }
outl((unsigned long) skb, card->pci_conf + DMAPADR0); /* Copy to here */ outl(skb, card->pci_conf + DMAPADR0); /* Copy to here */
outl((unsigned long) mem, card->pci_conf + DMALADR0); /* from here */ outl(mem, card->pci_conf + DMALADR0); /* from here */
outl(len, card->pci_conf + DMASIZ0); /* for this length */ outl(len, card->pci_conf + DMASIZ0); /* for this length */
outl(0x00000000c, card->pci_conf + DMADPR0); /* In this direction */ outl(0x00000000c, card->pci_conf + DMADPR0); /* In this direction */
@ -1309,8 +1310,8 @@ fst_intr_rx(struct fst_card_info *card, struct fst_port_info *port)
card->dma_port_rx = port; card->dma_port_rx = port;
card->dma_len_rx = len; card->dma_len_rx = len;
card->dma_rxpos = rxp; card->dma_rxpos = rxp;
fst_rx_dma(card, (char *) card->rx_dma_handle_card, fst_rx_dma(card, card->rx_dma_handle_card,
(char *) BUF_OFFSET(rxBuffer[pi][rxp][0]), len); BUF_OFFSET(rxBuffer[pi][rxp][0]), len);
} }
if (rxp != port->rxpos) { if (rxp != port->rxpos) {
dbg(DBG_ASS, "About to increment rxpos by more than 1\n"); dbg(DBG_ASS, "About to increment rxpos by more than 1\n");