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

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

drivers/net: Remove casts of void * 



Unnecessary casts of void * clutter the code.

These are the remainder casts after several specific
patches to remove netdev_priv and dev_priv.

Done via coccinelle script (and a little editing):

$ cat cast_void_pointer.cocci
@@
type T;
T *pt;
void *pv;
@@

- pt = (T *)pv;
+ pt = pv;

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
Acked-By: default avatarChris Snook <chris.snook@gmail.com>
Acked-by: default avatarJon Mason <jdmason@kudzu.us>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarDavid Dillow <dave@thedillows.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dadbe85a

drivers/net/a2065.c

+3 −8
Original line number Diff line number Diff line
@@ -421,16 +421,11 @@ static int lance_tx (struct net_device *dev) 


static irqreturn_t lance_interrupt (int irq, void *dev_id)

{

	struct net_device *dev;

	struct lance_private *lp;

	volatile struct lance_regs *ll;

	struct net_device *dev = dev_id;

	struct lance_private *lp = netdev_priv(dev);

	volatile struct lance_regs *ll = lp->ll;

	int csr0;



	dev = (struct net_device *) dev_id;



	lp = netdev_priv(dev);

	ll = lp->ll;



	ll->rap = LE_CSR0;		/* LANCE Controller Status */

	csr0 = ll->rdp;

drivers/net/appletalk/ltpc.c

+4 −4
Original line number Diff line number Diff line
@@ -652,9 +652,9 @@ static int do_write(struct net_device *dev, void *cbuf, int cbuflen, 
	int ret;



	if(i) {

		qels[i].cbuf = (unsigned char *) cbuf;

		qels[i].cbuf = cbuf;

		qels[i].cbuflen = cbuflen;

		qels[i].dbuf = (unsigned char *) dbuf;

		qels[i].dbuf = dbuf;

		qels[i].dbuflen = dbuflen;

		qels[i].QWrite = 1;

		qels[i].mailbox = i;  /* this should be initted rather */
@@ -676,9 +676,9 @@ static int do_read(struct net_device *dev, void *cbuf, int cbuflen, 
	int ret;



	if(i) {

		qels[i].cbuf = (unsigned char *) cbuf;

		qels[i].cbuf = cbuf;

		qels[i].cbuflen = cbuflen;

		qels[i].dbuf = (unsigned char *) dbuf;

		qels[i].dbuf = dbuf;

		qels[i].dbuflen = dbuflen;

		qels[i].QWrite = 0;

		qels[i].mailbox = i;  /* this should be initted rather */

drivers/net/atl1e/atl1e_main.c

+2 −3
Original line number Diff line number Diff line
@@ -800,8 +800,7 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter) 
	/* Init TPD Ring */

	tx_ring->dma = roundup(adapter->ring_dma, 8);

	offset = tx_ring->dma - adapter->ring_dma;

	tx_ring->desc = (struct atl1e_tpd_desc *)

			(adapter->ring_vir_addr + offset);

	tx_ring->desc = adapter->ring_vir_addr + offset;

	size = sizeof(struct atl1e_tx_buffer) * (tx_ring->count);

	tx_ring->tx_buffer = kzalloc(size, GFP_KERNEL);

	if (tx_ring->tx_buffer == NULL) {
@@ -827,7 +826,7 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter) 


	/* Init CMB dma address */

	tx_ring->cmb_dma = adapter->ring_dma + offset;

	tx_ring->cmb     = (u32 *)(adapter->ring_vir_addr + offset);

	tx_ring->cmb = adapter->ring_vir_addr + offset;

	offset += sizeof(u32);



	for (i = 0; i < adapter->num_rx_queues; i++) {

drivers/net/atlx/atl2.c

+1 −2
Original line number Diff line number Diff line
@@ -311,8 +311,7 @@ static s32 atl2_setup_ring_resources(struct atl2_adapter *adapter) 
	adapter->txd_dma = adapter->ring_dma ;

	offset = (adapter->txd_dma & 0x7) ? (8 - (adapter->txd_dma & 0x7)) : 0;

	adapter->txd_dma += offset;

	adapter->txd_ring = (struct tx_pkt_header *) (adapter->ring_vir_addr +

		offset);

	adapter->txd_ring = adapter->ring_vir_addr + offset;



	/* Init TXS Ring */

	adapter->txs_dma = adapter->txd_dma + adapter->txd_ring_size;

drivers/net/benet/be_cmds.c

+1 −2
Original line number Diff line number Diff line
@@ -2334,8 +2334,7 @@ int be_cmd_get_cntl_attributes(struct be_adapter *adapter) 


	status = be_mbox_notify_wait(adapter);

	if (!status) {

		attribs = (struct mgmt_controller_attrib *)( attribs_cmd.va +

					sizeof(struct be_cmd_resp_hdr));

		attribs = attribs_cmd.va + sizeof(struct be_cmd_resp_hdr);

		adapter->hba_port_num = attribs->hba_attribs.phy_port;

	}