Commit 73f03424 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Linus Torvalds

[PATCH] WANPIPE/SDLA driver gcc-3.4 fixes

This patch fixes gcc-3.4 cast-as-lvalue warnings in the 2.6.9-rc2 kernel's
WANPIPE/SDLA net drivers.  This is a forward port of the fix I made for the
2.4 kernel.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4e14dc19
...@@ -3678,7 +3678,7 @@ static int process_udp_mgmt_pkt(sdla_t* card) ...@@ -3678,7 +3678,7 @@ static int process_udp_mgmt_pkt(sdla_t* card)
break; break;
} }
(void *)ptr_trc_el = card->u.f.curr_trc_el; ptr_trc_el = (void *)card->u.f.curr_trc_el;
buffer_length = 0; buffer_length = 0;
fr_udp_pkt->data[0x00] = 0x00; fr_udp_pkt->data[0x00] = 0x00;
...@@ -3729,7 +3729,7 @@ static int process_udp_mgmt_pkt(sdla_t* card) ...@@ -3729,7 +3729,7 @@ static int process_udp_mgmt_pkt(sdla_t* card)
ptr_trc_el ++; ptr_trc_el ++;
if((void *)ptr_trc_el > card->u.f.trc_el_last) if((void *)ptr_trc_el > card->u.f.trc_el_last)
(void*)ptr_trc_el = card->u.f.trc_el_base; ptr_trc_el = (void*)card->u.f.trc_el_base;
buffer_length += sizeof(fpipemon_trc_hdr_t); buffer_length += sizeof(fpipemon_trc_hdr_t);
if(fpipemon_trc->fpipemon_trc_hdr.data_passed) { if(fpipemon_trc->fpipemon_trc_hdr.data_passed) {
......
...@@ -937,7 +937,7 @@ int sdla_peek (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len) ...@@ -937,7 +937,7 @@ int sdla_peek (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len)
peek_by_4 ((unsigned long)hw->dpmbase + curpos, buf, peek_by_4 ((unsigned long)hw->dpmbase + curpos, buf,
curlen); curlen);
addr += curlen; addr += curlen;
(char*)buf += curlen; buf = (char*)buf + curlen;
len -= curlen; len -= curlen;
} }
...@@ -1019,7 +1019,7 @@ int sdla_poke (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len) ...@@ -1019,7 +1019,7 @@ int sdla_poke (sdlahw_t* hw, unsigned long addr, void* buf, unsigned len)
poke_by_4 ((unsigned long)hw->dpmbase + curpos, buf, poke_by_4 ((unsigned long)hw->dpmbase + curpos, buf,
curlen); curlen);
addr += curlen; addr += curlen;
(char*)buf += curlen; buf = (char*)buf + curlen;
len -= curlen; len -= curlen;
} }
...@@ -2001,7 +2001,7 @@ static int detect_s514 (sdlahw_t* hw) ...@@ -2001,7 +2001,7 @@ static int detect_s514 (sdlahw_t* hw)
(void *)hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr, (void *)hw->dpmbase = ioremap((unsigned long)S514_mem_base_addr,
(unsigned long)MAX_SIZEOF_S514_MEMORY); (unsigned long)MAX_SIZEOF_S514_MEMORY);
/* map the physical control register memory to virtual memory */ /* map the physical control register memory to virtual memory */
(void *)hw->vector = ioremap( hw->vector = (unsigned long)ioremap(
(unsigned long)(S514_mem_base_addr + S514_CTRL_REG_BYTE), (unsigned long)(S514_mem_base_addr + S514_CTRL_REG_BYTE),
(unsigned long)16); (unsigned long)16);
......
...@@ -976,7 +976,7 @@ static int ioctl_dump (sdla_t* card, sdla_dump_t* u_dump) ...@@ -976,7 +976,7 @@ static int ioctl_dump (sdla_t* card, sdla_dump_t* u_dump)
dump.length -= len; dump.length -= len;
dump.offset += len; dump.offset += len;
(char*)dump.ptr += len; dump.ptr = (char*)dump.ptr + len;
} }
sdla_mapmem(&card->hw, oldvec);/* restore DPM window position */ sdla_mapmem(&card->hw, oldvec);/* restore DPM window position */
......
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