Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64699336 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20d5ec43

drivers/net/ethernet/8390/apne.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ apne_block_input(struct net_device *dev, int count, struct sk_buff *skb, int rin 
	buf[count-1] = inb(NE_BASE + NE_DATAPORT);

      }

    } else {

      ptrc = (char*)buf;

      ptrc = buf;

      for (cnt = 0; cnt < count; cnt++)

        *ptrc++ = inb(NE_BASE + NE_DATAPORT);

    }

drivers/net/ethernet/aeroflex/greth.c

+4 −4
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p) 
	struct greth_regs *regs;



	greth = netdev_priv(dev);

	regs = (struct greth_regs *) greth->regs;

	regs = greth->regs;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;
@@ -1036,7 +1036,7 @@ static void greth_set_hash_filter(struct net_device *dev) 
{

	struct netdev_hw_addr *ha;

	struct greth_private *greth = netdev_priv(dev);

	struct greth_regs *regs = (struct greth_regs *) greth->regs;

	struct greth_regs *regs = greth->regs;

	u32 mc_filter[2];

	unsigned int bitnr;
@@ -1055,7 +1055,7 @@ static void greth_set_multicast_list(struct net_device *dev) 
{

	int cfg;

	struct greth_private *greth = netdev_priv(dev);

	struct greth_regs *regs = (struct greth_regs *) greth->regs;

	struct greth_regs *regs = greth->regs;



	cfg = GRETH_REGLOAD(regs->control);

	if (dev->flags & IFF_PROMISC)
@@ -1414,7 +1414,7 @@ static int __devinit greth_of_probe(struct platform_device *ofdev) 
		goto error1;

	}



	regs = (struct greth_regs *) greth->regs;

	regs = greth->regs;

	greth->irq = ofdev->archdata.irqs[0];



	dev_set_drvdata(greth->dev, dev);

drivers/net/ethernet/amd/declance.c

+2 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ static int lance_rx(struct net_device *dev) 
			skb_put(skb, len);	/* make room */



			cp_from_buf(lp->type, skb->data,

				    (char *)lp->rx_buf_ptr_cpu[entry], len);

				    lp->rx_buf_ptr_cpu[entry], len);



			skb->protocol = eth_type_trans(skb, dev);

			netif_rx(skb);
@@ -919,7 +919,7 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	*lib_ptr(ib, btx_ring[entry].length, lp->type) = (-len);

	*lib_ptr(ib, btx_ring[entry].misc, lp->type) = 0;



	cp_to_buf(lp->type, (char *)lp->tx_buf_ptr_cpu[entry], skb->data, len);

	cp_to_buf(lp->type, lp->tx_buf_ptr_cpu[entry], skb->data, len);



	/* Now, give the packet to the lance */

	*lib_ptr(ib, btx_ring[entry].tmd1, lp->type) =

drivers/net/ethernet/apple/macmace.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int __devinit mace_probe(struct platform_device *pdev) 
	 * bits are reversed.

	 */



	addr = (void *)MACE_PROM;

	addr = MACE_PROM;



	for (j = 0; j < 6; ++j) {

		u8 v = bitrev8(addr[j<<4]);

drivers/net/ethernet/atheros/atl1c/atl1c_hw.c

+3 −3
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ int atl1c_phy_reset(struct atl1c_hw *hw) 


int atl1c_phy_init(struct atl1c_hw *hw)

{

	struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;

	struct atl1c_adapter *adapter = hw->adapter;

	struct pci_dev *pdev = adapter->pdev;

	int ret_val;

	u16 mii_bmcr_data = BMCR_RESET;
@@ -696,7 +696,7 @@ int atl1c_get_speed_and_duplex(struct atl1c_hw *hw, u16 *speed, u16 *duplex) 
/* select one link mode to get lower power consumption */

int atl1c_phy_to_ps_link(struct atl1c_hw *hw)

{

	struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;

	struct atl1c_adapter *adapter = hw->adapter;

	struct pci_dev *pdev = adapter->pdev;

	int ret = 0;

	u16 autoneg_advertised = ADVERTISED_10baseT_Half;
@@ -768,7 +768,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw) 


int atl1c_power_saving(struct atl1c_hw *hw, u32 wufc)

{

	struct atl1c_adapter *adapter = (struct atl1c_adapter *)hw->adapter;

	struct atl1c_adapter *adapter = hw->adapter;

	struct pci_dev *pdev = adapter->pdev;

	u32 master_ctrl, mac_ctrl, phy_ctrl;

	u32 wol_ctrl, speed;