ethernet: Remove casts to same type

Adding casts of objects to the same type is unnecessary
and confusing for a human reader.

For example, this cast:

        int y;
        int *p = (int *)&y;

I used the coccinelle script below to find and remove these
unnecessary casts.  I manually removed the conversions this
script produces of casts with __force, __iomem and __user.

@@
type T;
T *p;
@@

-       (T *)p
+       p

A function in atl1e_main.c was passed a const pointer
when it actually modified elements of the structure.

Change the argument to a non-const pointer.

A function in stmmac needed a __force to avoid a sparse
warning.  Added it.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/ethernet/i825xx/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
index 6c2952c8ea15..3735bfa53600 100644
--- a/drivers/net/ethernet/i825xx/lp486e.c
+++ b/drivers/net/ethernet/i825xx/lp486e.c
@@ -629,10 +629,10 @@ init_i596(struct net_device *dev) {
 
         memcpy ((void *)lp->eth_addr, dev->dev_addr, 6);
         lp->set_add.command = CmdIASetup;
-        i596_add_cmd(dev, (struct i596_cmd *)&lp->set_add);
+        i596_add_cmd(dev, &lp->set_add);
 
         lp->tdr.command = CmdTDR;
-        i596_add_cmd(dev, (struct i596_cmd *)&lp->tdr);
+        i596_add_cmd(dev, &lp->tdr);
 
         if (lp->scb.command && i596_timeout(dev, "i82596 init", 200))
                 return 1;
@@ -737,7 +737,7 @@ i596_cleanup_cmd(struct net_device *dev) {
 
         lp = netdev_priv(dev);
         while (lp->cmd_head) {
-                cmd = (struct i596_cmd *)lp->cmd_head;
+                cmd = lp->cmd_head;
 
                 lp->cmd_head = pa_to_va(lp->cmd_head->pa_next);
                 lp->cmd_backlog--;
@@ -1281,7 +1281,7 @@ static void set_multicast_list(struct net_device *dev) {
                         lp->i596_config[8] |= 0x01;
                 }
 
-                i596_add_cmd(dev, (struct i596_cmd *) &lp->set_conf);
+                i596_add_cmd(dev, &lp->set_conf);
         }
 }
 
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index cae17f4bc93e..353f57f675d0 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -571,7 +571,7 @@ static int init586(struct net_device *dev)
         }
 #endif
 
-        ptr = alloc_rfa(dev,(void *)ptr); /* init receive-frame-area */
+        ptr = alloc_rfa(dev,ptr); /* init receive-frame-area */
 
         /*
          * alloc xmit-buffs / init xmit_cmds
@@ -584,7 +584,7 @@ static int init586(struct net_device *dev)
                 ptr = (char *) ptr + XMIT_BUFF_SIZE;
                 p->xmit_buffs[i] = (struct tbd_struct *)ptr; /* TBD */
                 ptr = (char *) ptr + sizeof(struct tbd_struct);
-                if((void *)ptr > (void *)dev->mem_end)
+                if(ptr > (void *)dev->mem_end)
                 {
                         printk("%s: not enough shared-mem for your configuration!\n",dev->name);
                         return 1;