Re: [PATCH 30/56] net: Remove void casts

[Bert Wesarg]

On Wed, Apr 8, 2009 at 13:22, Jack Stone <jwjstone@xxxxxxxxxxx> wrote:
> Remove uneeded void casts
>
> Signed-Off-By: Jack Stone <jwjstone@xxxxxxxxxxx>
> ---
> Âdrivers/net/arm/at91_ether.c      |  Â2 +-
> Âdrivers/net/cassini.c         Â|  Â3 +--
> Âdrivers/net/fs_enet/mac-fcc.c     Â|  Â2 +-
> Âdrivers/net/fs_enet/mac-fec.c     Â|  Â2 +-
> Âdrivers/net/fs_enet/mac-scc.c     Â|  Â3 +--
> Âdrivers/net/gianfar.c         Â|  Â2 +-
> Âdrivers/net/ibmveth.c         Â|  Â4 ++--
> Âdrivers/net/irda/au1k_ir.c       |  Â3 +--
> Âdrivers/net/netxen/netxen_nic_init.c  |  Â6 ++----
> Âdrivers/net/skfp/ess.c         |  20 ++++++++++----------
> Âdrivers/net/skfp/hwmtm.c        |  Â7 +++----
> Âdrivers/net/skfp/pmf.c         |  Â4 ++--
> Âdrivers/net/skfp/smt.c         |  Â3 +--
> Âdrivers/net/sungem.c          |  Â3 +--
> Âdrivers/net/sunhme.c          |  Â3 +--
> Âdrivers/net/typhoon.c         Â|  Â2 +-
> Âdrivers/net/via-velocity.c       |  Â2 +-
> Âdrivers/net/wan/dscc4.c        Â|  Â6 +++---
> Âdrivers/net/wireless/ipw2x00/ipw2100.c | Â Â3 +--
> Â19 files changed, 35 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
> index 5c6315d..d3c58fe 100644
> --- a/drivers/net/ibmveth.c
> +++ b/drivers/net/ibmveth.c
> @@ -1218,7 +1218,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
> Â Â Â Âibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âdev->unit_address);
>
> - Â Â Â mac_addr_p = (unsigned char *) vio_get_attribute(dev,
> + Â Â Â mac_addr_p = vio_get_attribute(dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂVETH_MAC_ADDR, NULL);
Please check.

> Â Â Â Âif(!mac_addr_p) {
> Â Â Â Â Â Â Â Âprintk(KERN_ERR "(%s:%3.3d) ERROR: Can't find VETH_MAC_ADDR "
> @@ -1226,7 +1226,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
> Â Â Â Â Â Â Â Âreturn 0;
> Â Â Â Â}
>
> - Â Â Â mcastFilterSize_p = (unsigned int *) vio_get_attribute(dev,
> + Â Â Â mcastFilterSize_p = vio_get_attribute(dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂVETH_MCAST_FILTER_SIZE, NULL);
Please check.

> Â Â Â Âif(!mcastFilterSize_p) {
> Â Â Â Â Â Â Â Âprintk(KERN_ERR "(%s:%3.3d) ERROR: Can't find "
> diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
> index cf25eb4..eb01dd9 100644
> --- a/drivers/net/typhoon.c
> +++ b/drivers/net/typhoon.c
> @@ -872,7 +872,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
> Â Â Â Â Â Â Â Â Â Â Â Âtyphoon_inc_tx_index(&txRing->lastWrite, 1);
>
> Â Â Â Â Â Â Â Â Â Â Â Âlen = frag->size;
> - Â Â Â Â Â Â Â Â Â Â Â frag_addr = (void *) page_address(frag->page) +
> + Â Â Â Â Â Â Â Â Â Â Â frag_addr = page_address(frag->page) +
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âfrag->page_offset;
I think this cast was intentional too, because of the pointer arithmetic.

> Â Â Â Â Â Â Â Â Â Â Â Âskb_dma = pci_map_single(tp->tx_pdev, frag_addr, len,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â PCI_DMA_TODEVICE);
> diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
> index fb53ef8..58c1dd8 100644
> --- a/drivers/net/via-velocity.c
> +++ b/drivers/net/via-velocity.c
> @@ -2136,7 +2136,7 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
>
> Â Â Â Â Â Â Â Â Â Â Â Âfor (i = 0; i < nfrags; i++) {
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âskb_frag_t *frag = &skb_shinfo(skb)->frags[i];
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *addr = (void *)page_address(frag->page) + frag->page_offset;
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â void *addr = page_address(frag->page) + frag->page_offset;
Dito.

>
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âtdinfo->skb_dma[i + 1] = pci_map_single(vptr->pdev, addr, frag->size, PCI_DMA_TODEVICE);
>
> diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
> index 8face5d..83a9489 100644
> --- a/drivers/net/wan/dscc4.c
> +++ b/drivers/net/wan/dscc4.c
> @@ -771,7 +771,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
> Â Â Â Â}
> Â Â Â Â/* Global interrupt queue */
> Â Â Â Âwritel((u32)(((IRQ_RING_SIZE >> 5) - 1) << 20), ioaddr + IQLENR1);
> - Â Â Â priv->iqcfg = (__le32 *) pci_alloc_consistent(pdev,
> + Â Â Â priv->iqcfg = pci_alloc_consistent(pdev,
Endian annotations.

> Â Â Â Â Â Â Â ÂIRQ_RING_SIZE*sizeof(__le32), &priv->iqcfg_dma);
> Â Â Â Âif (!priv->iqcfg)
> Â Â Â Â Â Â Â Âgoto err_free_irq_5;
> @@ -785,7 +785,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
> Â Â Â Â */
> Â Â Â Âfor (i = 0; i < dev_per_card; i++) {
> Â Â Â Â Â Â Â Âdpriv = priv->root + i;
> - Â Â Â Â Â Â Â dpriv->iqtx = (__le32 *) pci_alloc_consistent(pdev,
> + Â Â Â Â Â Â Â dpriv->iqtx = pci_alloc_consistent(pdev,
Dito.

> Â Â Â Â Â Â Â Â Â Â Â ÂIRQ_RING_SIZE*sizeof(u32), &dpriv->iqtx_dma);
> Â Â Â Â Â Â Â Âif (!dpriv->iqtx)
> Â Â Â Â Â Â Â Â Â Â Â Âgoto err_free_iqtx_6;
> @@ -793,7 +793,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
> Â Â Â Â}
> Â Â Â Âfor (i = 0; i < dev_per_card; i++) {
> Â Â Â Â Â Â Â Âdpriv = priv->root + i;
> - Â Â Â Â Â Â Â dpriv->iqrx = (__le32 *) pci_alloc_consistent(pdev,
> + Â Â Â Â Â Â Â dpriv->iqrx = pci_alloc_consistent(pdev,
Dito.

> Â Â Â Â Â Â Â Â Â Â Â ÂIRQ_RING_SIZE*sizeof(u32), &dpriv->iqrx_dma);
> Â Â Â Â Â Â Â Âif (!dpriv->iqrx)
> Â Â Â Â Â Â Â Â Â Â Â Âgoto err_free_iqrx_7;
> diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
> index 97e5647..71335a8 100644
> --- a/drivers/net/wireless/ipw2x00/ipw2100.c
> +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
> @@ -4301,8 +4301,7 @@ static int status_queue_allocate(struct ipw2100_priv *priv, int entries)
> Â Â Â ÂIPW_DEBUG_INFO("enter\n");
>
> Â Â Â Âq->size = entries * sizeof(struct ipw2100_status);
> - Â Â Â q->drv =
> - Â Â Â Â Â (struct ipw2100_status *)pci_alloc_consistent(priv->pci_dev,
> + Â Â Â q->drv = pci_alloc_consistent(priv->pci_dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âq->size, &q->nic);
Please check.

> Â Â Â Âif (!q->drv) {
> Â Â Â Â Â Â Â ÂIPW_DEBUG_WARNING("Can not allocate status queue.\n");
> --
Bert
èº{.nÇ+‰·Ÿ®‰­†+%ŠËlzwm…ébëæìr¸›zX§»®w¥Š{ayºÊÚë,j­¢f£¢·hš‹àz¹®w¥¢¸¢·¦j:+v‰¨ŠwèjØm¶Ÿÿ¾«‘êçzZ+ƒùšŽŠÝj"ú!¶iO•æ¬z·švØ^¶m§ÿðÃnÆàþY&—