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

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

drivers: net: 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

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c208890

drivers/net/appletalk/cops.c

+1 −1
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ static int cops_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
{

        struct cops_local *lp = netdev_priv(dev);

        struct sockaddr_at *sa = (struct sockaddr_at *)&ifr->ifr_addr;

        struct atalk_addr *aa = (struct atalk_addr *)&lp->node_addr;

        struct atalk_addr *aa = &lp->node_addr;



        switch(cmd)

        {

drivers/net/can/bfin_can.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int __devinit bfin_can_probe(struct platform_device *pdev) 
	dev_info(&pdev->dev,

		"%s device registered"

		"(&reg_base=%p, rx_irq=%d, tx_irq=%d, err_irq=%d, sclk=%d)\n",

		DRV_NAME, (void *)priv->membase, priv->rx_irq,

		DRV_NAME, priv->membase, priv->rx_irq,

		priv->tx_irq, priv->err_irq, priv->can.clock.freq);

	return 0;

drivers/net/can/mcp251x.c

+1 −2
Original line number Diff line number Diff line
@@ -1020,8 +1020,7 @@ static int __devinit mcp251x_can_probe(struct spi_device *spi) 
						      GFP_DMA);



		if (priv->spi_tx_buf) {

			priv->spi_rx_buf = (u8 *)(priv->spi_tx_buf +

						  (PAGE_SIZE / 2));

			priv->spi_rx_buf = (priv->spi_tx_buf + (PAGE_SIZE / 2));

			priv->spi_rx_dma = (dma_addr_t)(priv->spi_tx_dma +

							(PAGE_SIZE / 2));

		} else {

drivers/net/fddi/defxx.c

+2 −2
Original line number Diff line number Diff line
@@ -2962,7 +2962,7 @@ static int dfx_rcv_init(DFX_board_t *bp, int get_buffers) 
			bp->descr_block_virt->rcv_data[i+j].long_0 = (u32) (PI_RCV_DESCR_M_SOP |

				((PI_RCV_DATA_K_SIZE_MAX / PI_ALIGN_K_RCV_DATA_BUFF) << PI_RCV_DESCR_V_SEG_LEN));

			bp->descr_block_virt->rcv_data[i+j].long_1 = (u32) (bp->rcv_block_phys + (i * PI_RCV_DATA_K_SIZE_MAX));

			bp->p_rcv_buff_va[i+j] = (char *) (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX));

			bp->p_rcv_buff_va[i+j] = (bp->rcv_block_virt + (i * PI_RCV_DATA_K_SIZE_MAX));

			}

#endif

	}
@@ -3030,7 +3030,7 @@ static void dfx_rcv_queue_process( 
#ifdef DYNAMIC_BUFFERS

		p_buff = (char *) (((struct sk_buff *)bp->p_rcv_buff_va[entry])->data);

#else

		p_buff = (char *) bp->p_rcv_buff_va[entry];

		p_buff = bp->p_rcv_buff_va[entry];

#endif

		memcpy(&descr, p_buff + RCV_BUFF_K_DESCR, sizeof(u32));

drivers/net/fddi/skfp/pmf.c

+4 −4
Original line number Diff line number Diff line
@@ -1242,7 +1242,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, 
			if (len < 8)

				goto len_error ;

			if (set)

				memcpy((char *) to,(char *) from+2,6) ;

				memcpy(to,from+2,6) ;

			to += 8 ;

			from += 8 ;

			len -= 8 ;
@@ -1251,7 +1251,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, 
			if (len < 4)

				goto len_error ;

			if (set)

				memcpy((char *) to,(char *) from,4) ;

				memcpy(to,from,4) ;

			to += 4 ;

			from += 4 ;

			len -= 4 ;
@@ -1260,7 +1260,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, 
			if (len < 8)

				goto len_error ;

			if (set)

				memcpy((char *) to,(char *) from,8) ;

				memcpy(to,from,8) ;

			to += 8 ;

			from += 8 ;

			len -= 8 ;
@@ -1269,7 +1269,7 @@ static int smt_set_para(struct s_smc *smc, struct smt_para *pa, int index, 
			if (len < 32)

				goto len_error ;

			if (set)

				memcpy((char *) to,(char *) from,32) ;

				memcpy(to,from,32) ;

			to += 32 ;

			from += 32 ;

			len -= 32 ;