summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-22 18:36:19 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-23 14:19:21 -0500
commit10cbe3b6a4b2289906fc94bb26810191607ee748 (patch)
treeaeb321b6e60c0edeb025a73955651dc064e962ec /drivers
parentd1527b55f5ab162f2d17600ffc2744c2ea39d356 (diff)
downloadblackbird-obmc-uboot-10cbe3b6a4b2289906fc94bb26810191607ee748.tar.gz
blackbird-obmc-uboot-10cbe3b6a4b2289906fc94bb26810191607ee748.zip
net: Fix remaining API interface breakage
These are all the files which use the API incorrectly but did not get built using MAKEALL -a powerpc|arm. I have no compiler for them, but the remaining issues should be far less than without this patch. Any outstanding issues are left to the maintainers of boards that use these drivers. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/altera_tse.c3
-rw-r--r--drivers/net/ax88180.c3
-rw-r--r--drivers/net/bfin_mac.c5
-rw-r--r--drivers/net/bfin_mac.h2
-rw-r--r--drivers/net/designware.c5
-rw-r--r--drivers/net/ep93xx_eth.c2
-rw-r--r--drivers/net/ethoc.c2
-rw-r--r--drivers/net/fsl_mcdmafec.c7
-rw-r--r--drivers/net/ftgmac100.c3
-rw-r--r--drivers/net/greth.c2
-rw-r--r--drivers/net/inca-ip_sw.c4
-rw-r--r--drivers/net/mcffec.c3
-rw-r--r--drivers/net/mvgbe.c3
-rw-r--r--drivers/net/ne2000_base.c2
-rw-r--r--drivers/net/netarm_eth.c2
-rw-r--r--drivers/net/plb2800_eth.c6
-rw-r--r--drivers/net/sh_eth.c8
-rw-r--r--drivers/usb/gadget/ether.c7
18 files changed, 29 insertions, 40 deletions
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 0e6aac7173..de517f8dab 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 bc3e6ad58a..f5017682d4 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 dcc781a46a..e24ac4a174 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 c731c179b5..54ffb3830e 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 e8e669bd90..9b17db41f6 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 c09384c632..245ad1c25d 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 5824fd6827..af06d4fb82 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 5330dbc79f..63842cd466 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 0af0c3450f..69ba57d3d0 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 2aab52f378..08206c8711 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 c45389e0cd..f0f62deaf8 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 a08ff278bf..ed7459c647 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 dcc1547c1c..47bf27c8ba 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 8275091871..ef35922042 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 f54817e58d..325f16c3a8 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 d799c73823..93782c23ff 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 8d3dac20af..d5ef29c837 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 = &eth->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 f693fea1e9..d975fb680e 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;
OpenPOWER on IntegriCloud