diff options
29 files changed, 41 insertions, 64 deletions
diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_eth.c b/arch/mips/cpu/mips32/au1x00/au1x00_eth.c index c51079961..ac03a452b 100644 --- a/arch/mips/cpu/mips32/au1x00/au1x00_eth.c +++ b/arch/mips/cpu/mips32/au1x00/au1x00_eth.c @@ -147,7 +147,8 @@ int au1x00_miiphy_write(const char *devname, unsigned char addr, } #endif -static int au1x00_send(struct eth_device* dev, volatile void *packet, int length){ +static int au1x00_send(struct eth_device *dev, void *packet, int length) +{ volatile mac_fifo_t *fifo_tx = (volatile mac_fifo_t*)(MAC0_TX_DMA_ADDR+MAC_TX_BUFF0_STATUS); int i; diff --git a/board/Marvell/db64360/mv_eth.c b/board/Marvell/db64360/mv_eth.c index 184135556..1874cd1e7 100644 --- a/board/Marvell/db64360/mv_eth.c +++ b/board/Marvell/db64360/mv_eth.c @@ -190,8 +190,7 @@ int db64360_eth_poll (struct eth_device *dev) return mv64360_eth_receive (dev); } -int db64360_eth_transmit (struct eth_device *dev, volatile void *packet, - int length) +int db64360_eth_transmit(struct eth_device *dev, void *packet, int length) { mv64360_eth_xmit (dev, packet, length); return 0; diff --git a/board/Marvell/db64360/mv_eth.h b/board/Marvell/db64360/mv_eth.h index 142910b59..bd8e05daf 100644 --- a/board/Marvell/db64360/mv_eth.h +++ b/board/Marvell/db64360/mv_eth.h @@ -167,9 +167,7 @@ struct mv64360_eth_priv { int mv64360_eth_init (struct eth_device *dev); int mv64360_eth_stop (struct eth_device *dev); -int mv64360_eth_start_xmit (struct eth_device*, volatile void* packet, int length); -/* return db64360_eth0_poll(); */ - +int mv64360_eth_start_xmit(struct eth_device *dev, void *packet, int length); int mv64360_eth_open (struct eth_device *dev); diff --git a/board/Marvell/db64460/mv_eth.c b/board/Marvell/db64460/mv_eth.c index da48fa897..a24a7e807 100644 --- a/board/Marvell/db64460/mv_eth.c +++ b/board/Marvell/db64460/mv_eth.c @@ -190,8 +190,7 @@ int db64460_eth_poll (struct eth_device *dev) return mv64460_eth_receive (dev); } -int db64460_eth_transmit (struct eth_device *dev, volatile void *packet, - int length) +int db64460_eth_transmit(struct eth_device *dev, void *packet, int length) { mv64460_eth_xmit (dev, packet, length); return 0; diff --git a/board/Marvell/db64460/mv_eth.h b/board/Marvell/db64460/mv_eth.h index cbe751a4c..af4e818fe 100644 --- a/board/Marvell/db64460/mv_eth.h +++ b/board/Marvell/db64460/mv_eth.h @@ -166,9 +166,7 @@ struct mv64460_eth_priv { int mv64460_eth_init (struct eth_device *dev); int mv64460_eth_stop (struct eth_device *dev); -int mv64460_eth_start_xmit (struct eth_device*, volatile void* packet, int length); -/* return db64460_eth0_poll(); */ - +int mv64460_eth_start_xmit(struct eth_device *dev, void *packet, int length); int mv64460_eth_open (struct eth_device *dev); diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c index 9cccbdb65..9455b62eb 100644 --- a/board/esd/cpci750/mv_eth.c +++ b/board/esd/cpci750/mv_eth.c @@ -190,8 +190,7 @@ int db64360_eth_poll (struct eth_device *dev) return mv64360_eth_receive (dev); } -int db64360_eth_transmit (struct eth_device *dev, volatile void *packet, - int length) +int db64360_eth_transmit(struct eth_device *dev, void *packet, int length) { mv64360_eth_xmit (dev, packet, length); return 0; diff --git a/board/esd/cpci750/mv_eth.h b/board/esd/cpci750/mv_eth.h index b76113534..3d0cb10dd 100644 --- a/board/esd/cpci750/mv_eth.h +++ b/board/esd/cpci750/mv_eth.h @@ -168,9 +168,7 @@ struct mv64360_eth_priv { int mv64360_eth_init (struct eth_device *dev); int mv64360_eth_stop (struct eth_device *dev); -int mv64360_eth_start_xmit (struct eth_device*, volatile void* packet, int length); -/* return db64360_eth0_poll(); */ - +int mv64360_eth_start_xmit(struct eth_device *dev, void *packet, int length); int mv64360_eth_open (struct eth_device *dev); diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c index eb87edcbf..a3a32761d 100644 --- a/board/evb64260/eth.c +++ b/board/evb64260/eth.c @@ -246,8 +246,7 @@ gt6426x_eth_poll(void *v) /************************************************************************** TRANSMIT - Transmit a frame ***************************************************************************/ -int -gt6426x_eth_transmit(void *v, volatile char *p, unsigned int s) +int gt6426x_eth_transmit(void *v, char *p, unsigned int s) { struct eth_device *wp = (struct eth_device *)v; struct eth_dev_s *dev = (struct eth_dev_s *)wp->priv; diff --git a/board/evb64260/eth.h b/board/evb64260/eth.h index beb6db16d..76bd72592 100644 --- a/board/evb64260/eth.h +++ b/board/evb64260/eth.h @@ -68,7 +68,7 @@ extern char *eth0_rx_buffer[NR]; extern char *eth_data; extern int gt6426x_eth_poll(void *v); -extern int gt6426x_eth_transmit(void *v, volatile char *p, unsigned int s); +extern int gt6426x_eth_transmit(void *v, char *p, unsigned int s); extern void gt6426x_eth_disable(void *v); extern int gt6426x_eth_probe(void *v, bd_t *bis); diff --git a/board/prodrive/p3mx/mv_eth.c b/board/prodrive/p3mx/mv_eth.c index 976cb0bc9..06f816d2a 100644 --- a/board/prodrive/p3mx/mv_eth.c +++ b/board/prodrive/p3mx/mv_eth.c @@ -202,8 +202,7 @@ int db64460_eth_poll (struct eth_device *dev) return mv64460_eth_receive (dev); } -int db64460_eth_transmit (struct eth_device *dev, volatile void *packet, - int length) +int db64460_eth_transmit(struct eth_device *dev, void *packet, int length) { mv64460_eth_xmit (dev, packet, length); return 0; diff --git a/board/prodrive/p3mx/mv_eth.h b/board/prodrive/p3mx/mv_eth.h index af1527479..8cc00dc9c 100644 --- a/board/prodrive/p3mx/mv_eth.h +++ b/board/prodrive/p3mx/mv_eth.h @@ -166,9 +166,7 @@ struct mv64460_eth_priv { int mv64460_eth_init (struct eth_device *dev); int mv64460_eth_stop (struct eth_device *dev); -int mv64460_eth_start_xmit (struct eth_device*, volatile void* packet, int length); -/* return db64460_eth0_poll(); */ - +int mv64460_eth_start_xmit(struct eth_device *dev, void *packet, int length); int mv64460_eth_open (struct eth_device *dev); diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c index 0e6aac717..de517f8da 100644 --- a/drivers/net/altera_tse.c +++ b/drivers/net/altera_tse.c @@ -257,8 +257,7 @@ static int tse_adjust_link(struct altera_tse_priv *priv) return 0; } -static int tse_eth_send(struct eth_device *dev, - volatile void *packet, int length) +static int tse_eth_send(struct eth_device *dev, void *packet, int length) { struct altera_tse_priv *priv = dev->priv; volatile struct alt_sgdma_registers *tx_sgdma = priv->sgdma_tx; diff --git a/drivers/net/ax88180.c b/drivers/net/ax88180.c index bc3e6ad58..f5017682d 100644 --- a/drivers/net/ax88180.c +++ b/drivers/net/ax88180.c @@ -604,8 +604,7 @@ static int ax88180_recv (struct eth_device *dev) } /* Send a data block via Ethernet. */ -static int -ax88180_send (struct eth_device *dev, volatile void *packet, int length) +static int ax88180_send(struct eth_device *dev, void *packet, int length) { struct ax88180_private *priv = (struct ax88180_private *)dev->priv; unsigned short TXDES_addr; diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index dcc781a46..e24ac4a17 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c @@ -118,8 +118,7 @@ int bfin_EMAC_initialize(bd_t *bis) return 0; } -static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, - int length) +static int bfin_EMAC_send(struct eth_device *dev, void *packet, int length) { int i; int result = 0; @@ -471,7 +470,7 @@ int ether_post_test(int flags) for (i = 0; i < 42; i++) buf[i + 22] = i; printf("--------Send 64 bytes......\n"); - bfin_EMAC_send(NULL, (volatile void *)buf, 64); + bfin_EMAC_send(NULL, buf, 64); for (i = 0; i < 100; i++) { udelay(10000); if ((rxbuf[rxIdx]->StatusWord & RX_COMP) != 0) { diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h index c731c179b..54ffb3830 100644 --- a/drivers/net/bfin_mac.h +++ b/drivers/net/bfin_mac.h @@ -58,7 +58,7 @@ static ADI_ETHER_BUFFER *SetupTxBuffer(int no); static int bfin_EMAC_init(struct eth_device *dev, bd_t *bd); static void bfin_EMAC_halt(struct eth_device *dev); -static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, int length); +static int bfin_EMAC_send(struct eth_device *dev, void *packet, int length); static int bfin_EMAC_recv(struct eth_device *dev); static int bfin_EMAC_setup_addr(struct eth_device *dev); diff --git a/drivers/net/designware.c b/drivers/net/designware.c index e8e669bd9..9b17db41f 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -189,8 +189,7 @@ static int dw_eth_init(struct eth_device *dev, bd_t *bis) return 0; } -static int dw_eth_send(struct eth_device *dev, volatile void *packet, - int length) +static int dw_eth_send(struct eth_device *dev, void *packet, int length) { struct dw_eth_dev *priv = dev->priv; struct eth_dma_regs *dma_p = priv->dma_regs_p; @@ -203,7 +202,7 @@ static int dw_eth_send(struct eth_device *dev, volatile void *packet, return -1; } - memcpy((void *)desc_p->dmamac_addr, (void *)packet, length); + memcpy((void *)desc_p->dmamac_addr, packet, length); #if defined(CONFIG_DW_ALTDESCRIPTOR) desc_p->txrx_status |= DESC_TXSTS_TXFIRST | DESC_TXSTS_TXLAST; diff --git a/drivers/net/ep93xx_eth.c b/drivers/net/ep93xx_eth.c index c09384c63..245ad1c25 100644 --- a/drivers/net/ep93xx_eth.c +++ b/drivers/net/ep93xx_eth.c @@ -380,7 +380,7 @@ static int ep93xx_eth_rcv_packet(struct eth_device *dev) * Send a block of data via ethernet. */ static int ep93xx_eth_send_packet(struct eth_device *dev, - volatile void * const packet, int const length) + void * const packet, int const length) { struct mac_regs *mac = GET_REGS(dev); struct ep93xx_priv *priv = GET_PRIV(dev); diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 5824fd682..af06d4fb8 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -414,7 +414,7 @@ static void ethoc_tx(struct eth_device *dev) (void)ethoc_update_tx_stats(&bd); } -static int ethoc_send(struct eth_device *dev, volatile void *packet, int length) +static int ethoc_send(struct eth_device *dev, void *packet, int length) { struct ethoc *priv = (struct ethoc *)dev->priv; struct ethoc_bd bd; diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index 5330dbc79..63842cd46 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -116,7 +116,7 @@ struct fec_info_dma fec_info[] = { #endif }; -static int fec_send(struct eth_device *dev, volatile void *packet, int length); +static int fec_send(struct eth_device *dev, void *packet, int length); static int fec_recv(struct eth_device *dev); static int fec_init(struct eth_device *dev, bd_t * bd); static void fec_halt(struct eth_device *dev); @@ -194,7 +194,7 @@ static void set_fec_duplex_speed(volatile fecdma_t * fecp, bd_t * bd, } } -static int fec_send(struct eth_device *dev, volatile void *packet, int length) +static int fec_send(struct eth_device *dev, void *packet, int length) { struct fec_info_dma *info = dev->priv; cbd_t *pTbd, *pUsedTbd; @@ -301,8 +301,7 @@ static int fec_recv(struct eth_device *dev) frame_length = pRbd->cbd_datlen - 4; /* Fill the buffer and pass it to upper layers */ - NetReceive((volatile uchar *)pRbd->cbd_bufaddr, - frame_length); + NetReceive((uchar *)pRbd->cbd_bufaddr, frame_length); len = frame_length; } diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index 0af0c3450..69ba57d3d 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -480,8 +480,7 @@ static int ftgmac100_recv(struct eth_device *dev) /* * Send a data block via Ethernet */ -static int -ftgmac100_send(struct eth_device *dev, void *packet, int length) +static int ftgmac100_send(struct eth_device *dev, void *packet, int length) { struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; struct ftgmac100_data *priv = dev->priv; diff --git a/drivers/net/greth.c b/drivers/net/greth.c index 2aab52f37..08206c871 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c @@ -403,7 +403,7 @@ void greth_halt(struct eth_device *dev) } } -int greth_send(struct eth_device *dev, volatile void *eth_data, int data_length) +int greth_send(struct eth_device *dev, void *eth_data, int data_length) { greth_priv *greth = dev->priv; greth_regs *regs = greth->regs; diff --git a/drivers/net/inca-ip_sw.c b/drivers/net/inca-ip_sw.c index c45389e0c..f0f62deaf 100644 --- a/drivers/net/inca-ip_sw.c +++ b/drivers/net/inca-ip_sw.c @@ -158,7 +158,7 @@ static int initialized = 0; static int inca_switch_init(struct eth_device *dev, bd_t * bis); -static int inca_switch_send(struct eth_device *dev, volatile void *packet, int length); +static int inca_switch_send(struct eth_device *dev, void *packet, int length); static int inca_switch_recv(struct eth_device *dev); static void inca_switch_halt(struct eth_device *dev); static void inca_init_switch_chip(void); @@ -334,7 +334,7 @@ static int inca_switch_init(struct eth_device *dev, bd_t * bis) } -static int inca_switch_send(struct eth_device *dev, volatile void *packet, int length) +static int inca_switch_send(struct eth_device *dev, void *packet, int length) { int i; int res = -1; diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index a08ff278b..ed7459c64 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -95,7 +95,6 @@ struct fec_info_s fec_info[] = { #endif }; -int fec_send(struct eth_device *dev, volatile void *packet, int length); int fec_recv(struct eth_device *dev); int fec_init(struct eth_device *dev, bd_t * bd); void fec_halt(struct eth_device *dev); @@ -134,7 +133,7 @@ void setFecDuplexSpeed(volatile fec_t * fecp, bd_t * bd, int dup_spd) } } -int fec_send(struct eth_device *dev, volatile void *packet, int length) +static int fec_send(struct eth_device *dev, void *packet, int length) { struct fec_info_s *info = dev->priv; volatile fec_t *fecp = (fec_t *) (info->iobase); diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c index dcc1547c1..47bf27c8b 100644 --- a/drivers/net/mvgbe.c +++ b/drivers/net/mvgbe.c @@ -525,8 +525,7 @@ static int mvgbe_write_hwaddr(struct eth_device *dev) return 0; } -static int mvgbe_send(struct eth_device *dev, void *dataptr, - int datasize) +static int mvgbe_send(struct eth_device *dev, void *dataptr, int datasize) { struct mvgbe_device *dmvgbe = to_mvgbe(dev); struct mvgbe_registers *regs = dmvgbe->regs; diff --git a/drivers/net/ne2000_base.c b/drivers/net/ne2000_base.c index 827509187..ef3592204 100644 --- a/drivers/net/ne2000_base.c +++ b/drivers/net/ne2000_base.c @@ -749,7 +749,7 @@ static int ne2k_recv(struct eth_device *dev) return 1; } -static int ne2k_send(struct eth_device *dev, volatile void *packet, int length) +static int ne2k_send(struct eth_device *dev, void *packet, int length) { int tmo; diff --git a/drivers/net/netarm_eth.c b/drivers/net/netarm_eth.c index f54817e58..325f16c3a 100644 --- a/drivers/net/netarm_eth.c +++ b/drivers/net/netarm_eth.c @@ -300,7 +300,7 @@ extern int eth_rx (void) } /* Send a data block via Ethernet. */ -extern int eth_send (volatile void *packet, int length) +extern int eth_send(void *packet, int length) { int i, length32; char *pa; diff --git a/drivers/net/plb2800_eth.c b/drivers/net/plb2800_eth.c index d799c7382..93782c23f 100644 --- a/drivers/net/plb2800_eth.c +++ b/drivers/net/plb2800_eth.c @@ -82,8 +82,7 @@ typedef volatile struct { static int plb2800_eth_init(struct eth_device *dev, bd_t * bis); -static int plb2800_eth_send(struct eth_device *dev, volatile void *packet, - int length); +static int plb2800_eth_send(struct eth_device *dev, void *packet, int length); static int plb2800_eth_recv(struct eth_device *dev); static void plb2800_eth_halt(struct eth_device *dev); @@ -162,8 +161,7 @@ static int plb2800_eth_init(struct eth_device *dev, bd_t * bis) } -static int plb2800_eth_send(struct eth_device *dev, volatile void *packet, - int length) +static int plb2800_eth_send(struct eth_device *dev, void *packet, int length) { int i; int res = -1; diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 8d3dac20a..d5ef29c83 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -46,7 +46,7 @@ #define TIMEOUT_CNT 1000 -int sh_eth_send(struct eth_device *dev, volatile void *packet, int len) +int sh_eth_send(struct eth_device *dev, void *packet, int len) { struct sh_eth_dev *eth = dev->priv; int port = eth->port, ret = 0, timeout; @@ -103,15 +103,15 @@ int sh_eth_recv(struct eth_device *dev) struct sh_eth_dev *eth = dev->priv; int port = eth->port, len = 0; struct sh_eth_info *port_info = ð->port_info[port]; - volatile u8 *packet; + uchar *packet; /* Check if the rx descriptor is ready */ if (!(port_info->rx_desc_cur->rd0 & RD_RACT)) { /* Check for errors */ if (!(port_info->rx_desc_cur->rd0 & RD_RFE)) { len = port_info->rx_desc_cur->rd1 & 0xffff; - packet = (volatile u8 *) - ADDR_TO_P2(port_info->rx_desc_cur->rd2); + packet = (uchar *) + ADDR_TO_P2(port_info->rx_desc_cur->rd2); NetReceive(packet, len); } diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index f693fea1e..d975fb680 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -2397,8 +2397,7 @@ fail: return -1; } -static int usb_eth_send(struct eth_device *netdev, - volatile void *packet, int length) +static int usb_eth_send(struct eth_device *netdev, void *packet, int length) { int retval; void *rndis_pkt = NULL; @@ -2419,11 +2418,11 @@ static int usb_eth_send(struct eth_device *netdev, } rndis_add_hdr(rndis_pkt, length); memcpy(rndis_pkt + sizeof(struct rndis_packet_msg_type), - (void *)packet, length); + packet, length); packet = rndis_pkt; length += sizeof(struct rndis_packet_msg_type); } - req->buf = (void *)packet; + req->buf = packet; req->context = NULL; req->complete = tx_complete; |