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>

diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_eth.c b/arch/mips/cpu/mips32/au1x00/au1x00_eth.c
index c51079961c08be327805903dde86de5f49e54a5c..ac03a452bc9d3af43eb1ab679cd308c8798bb99b 100644 (file)
--- 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 184135556711b9418e0fdc60b3b028fe851858f4..1874cd1e734ee3db602ef8f33624cb866eb727ef 100644 (file)
--- 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 142910b5982eff2e1ee4fd60563b3790afb0befa..bd8e05dafd606aa5d1df8b0df514e1f6138de09d 100644 (file)
--- 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 da48fa897f2fa36f120b9c552e29a89f0acbd5c6..a24a7e8072a395ff010b3436ed76f7b221e4266c 100644 (file)
--- 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 cbe751a4ceeee01c2c956660aef61444f49923ac..af4e818fe8e301819313bad6a196ef084d0eb5fb 100644 (file)
--- 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 9cccbdb65ce3063e92ada3f94b597c348453f714..9455b62eb026130295b8892de9a1100fb31df989 100644 (file)
--- 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 b761135349606f7d074a0a504f85ed14a3f9700c..3d0cb10dd5d883a05609560b3c5d9f35589d2b51 100644 (file)
--- 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 eb87edcbfec7d8e322e3cb32047e8a1711e55ff7..a3a32761dae14b01560924851881b1231f953bc3 100644 (file)
--- 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 beb6db16dfb93b3ee61ac27fb69fdaa2301d1499..76bd725921325ef987af9701a16b10674c3dc8c3 100644 (file)
--- 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 976cb0bc986d074544f46d540a5e37fcaf28f14b..06f816d2a1abf0870a0b85f66451c4b63dce97cb 100644 (file)
--- 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 af1527479feebcce7aab41da4aafe55a3bc72182..8cc00dc9c6194793ebc27f8c324d7698e2e97f9a 100644 (file)
--- 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 0e6aac7173032e97a282ec6b2f5ecf255d6d8160..de517f8dab9493f2a8492a8aa8ecc59d3d50b1ab 100644 (file)
--- 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 bc3e6ad58a0ff0e58080ff675b839353bbdc5f65..f5017682d496c0f4cf004ca9893ad509515c4f2e 100644 (file)
--- 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 dcc781a46aeab5a431f02ba1800e99daea2efa9e..e24ac4a174c12dd2064fb11510dd3e84b4f54cd1 100644 (file)
--- 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 c731c179b53e7da5cdd70f92505a5ef9a304669b..54ffb3830e2be000f6c7c971bbc35ecf6607220c 100644 (file)
--- 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 e8e669bd90406a9bb6359018e2c3b9535857365a..9b17db41f60b24353eb02d842a3907a7828e86c9 100644 (file)
--- 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 c09384c632fa9f2ccedf2dcb7ce12aac6fa933a2..245ad1c25d02ff05d701d7657ea54c5c4d6ccecb 100644 (file)
--- 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 5824fd6827ce307e8aac2039757b083bbcd1f20a..af06d4fb8226ef1631296db5f164647ab7b46e91 100644 (file)
--- 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 5330dbc79f92091e1bc415bbfade23a056784d55..63842cd466ed94dd531f435555d167270004f18c 100644 (file)
--- 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 0af0c3450f05a2c51648ba3dfe71cee1a4dc8cc2..69ba57d3d006e7638b96106221966b7980389682 100644 (file)
--- 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 2aab52f378eee90aaa321f6ce0d5fecf24fc6e74..08206c87119818e3cf432d34debdf16f42e9601b 100644 (file)
--- 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 c45389e0cd7e7beccb984a2ce9b2ff3393b3c294..f0f62deaf8e0d0e95dd0c4682c58c70823100e8e 100644 (file)
--- 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 a08ff278bfdbd764bf8f6980f690a0892e66076e..ed7459c6470d1ec03524892f7f9526ada590fd24 100644 (file)
--- 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 dcc1547c1c0c05da62ce45bf4875032a79b51bc0..47bf27c8ba3981d0d060ad090aacad4e41ef85e8 100644 (file)
--- 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 8275091871d16bddde5d31ce320ed0875747e953..ef35922042a4cbf4fbc60303d11ab57f2b4f9ad3 100644 (file)
--- 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 f54817e58dd3c984c5bcbb6a8ec670944fc5aaab..325f16c3a88ee4840602e80d2468ef42d9aa8778 100644 (file)
--- 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 d799c738234737969b3e0847e765eec5e03043b6..93782c23ff41cd2d26ef5140df4de168974d3c46 100644 (file)
--- 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 8d3dac20af207005f19eba93a58e4b4e0ec86888..d5ef29c8371c9c3473a8e00ca0a5acf0d157b8ec 100644 (file)
--- 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 f693fea1e9ba9d86fb6efee451cc16cc218d3cdb..d975fb680e3ce11d62b807ee845c1427887d9751 100644 (file)
--- 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;