5 files changed, 18 insertions, 19 deletions

diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index bb367582c1e8..e7cd587d8ae7 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -6946,9 +6946,9 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
                                 if (sp->rxd_mode == RXD_MODE_3B)
                                         ba = &ring->ba[j][k];
                                 if (set_rxd_buffer_pointer(sp, rxdp, ba, &skb,
-                                                           (u64 *)&temp0_64,
-                                                           (u64 *)&temp1_64,
-                                                           (u64 *)&temp2_64,
+                                                           &temp0_64,
+                                                           &temp1_64,
+                                                           &temp2_64,
                                                            size) == -ENOMEM) {
                                         return 0;
                                 }
@@ -7149,7 +7149,7 @@ static int s2io_card_up(struct s2io_nic *sp)
         int i, ret = 0;
         struct config_param *config;
         struct mac_info *mac_control;
-        struct net_device *dev = (struct net_device *)sp->dev;
+        struct net_device *dev = sp->dev;
         u16 interruptible;
 
         /* Initialize the H/W I/O registers */
@@ -7325,7 +7325,7 @@ static void s2io_tx_watchdog(struct net_device *dev)
 static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
 {
         struct s2io_nic *sp = ring_data->nic;
-        struct net_device *dev = (struct net_device *)ring_data->dev;
+        struct net_device *dev = ring_data->dev;
         struct sk_buff *skb = (struct sk_buff *)
                 ((unsigned long)rxdp->Host_Control);
         int ring_no = ring_data->ring_no;
@@ -7508,7 +7508,7 @@ aggregate:
 
 static void s2io_link(struct s2io_nic *sp, int link)
 {
-        struct net_device *dev = (struct net_device *)sp->dev;
+        struct net_device *dev = sp->dev;
         struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
 
         if (link != sp->last_link_state) {
@@ -8280,7 +8280,7 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,
                 return -1;
         }
 
-        *ip = (struct iphdr *)((u8 *)buffer + ip_off);
+        *ip = (struct iphdr *)(buffer + ip_off);
         ip_len = (u8)((*ip)->ihl);
         ip_len <<= 2;
         *tcp = (struct tcphdr *)((unsigned long)*ip + ip_len);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
index 98e2c10ae08b..32d06824fe3e 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
@@ -2346,7 +2346,7 @@ void __vxge_hw_blockpool_blocks_add(struct __vxge_hw_blockpool *blockpool)
 
         for (i = 0; i < nreq; i++)
                 vxge_os_dma_malloc_async(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         blockpool->hldev, VXGE_HW_BLOCK_SIZE);
 }
 
@@ -2428,13 +2428,13 @@ __vxge_hw_blockpool_blocks_remove(struct __vxge_hw_blockpool *blockpool)
                         break;
 
                 pci_unmap_single(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         ((struct __vxge_hw_blockpool_entry *)p)->dma_addr,
                         ((struct __vxge_hw_blockpool_entry *)p)->length,
                         PCI_DMA_BIDIRECTIONAL);
 
                 vxge_os_dma_free(
-                        ((struct __vxge_hw_device *)blockpool->hldev)->pdev,
+                        (blockpool->hldev)->pdev,
                         ((struct __vxge_hw_blockpool_entry *)p)->memblock,
                         &((struct __vxge_hw_blockpool_entry *)p)->acc_handle);
 
@@ -4059,7 +4059,7 @@ __vxge_hw_vpath_sw_reset(struct __vxge_hw_device *hldev, u32 vp_id)
         enum vxge_hw_status status = VXGE_HW_OK;
         struct __vxge_hw_virtualpath *vpath;
 
-        vpath = (struct __vxge_hw_virtualpath *)&hldev->virtual_paths[vp_id];
+        vpath = &hldev->virtual_paths[vp_id];
 
         if (vpath->ringh) {
                 status = __vxge_hw_ring_reset(vpath->ringh);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
index 5046a64f0fe8..9e0c1eed5dc5 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
@@ -1922,7 +1922,7 @@ realloc:
                 /* misaligned, free current one and try allocating
                  * size + VXGE_CACHE_LINE_SIZE memory
                  */
-                kfree((void *) vaddr);
+                kfree(vaddr);
                 size += VXGE_CACHE_LINE_SIZE;
                 realloc_flag = 1;
                 goto realloc;
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 51387c31914b..2578eb1f025d 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -1134,7 +1134,7 @@ static void vxge_set_multicast(struct net_device *dev)
                 "%s:%d", __func__, __LINE__);
 
         vdev = netdev_priv(dev);
-        hldev = (struct __vxge_hw_device  *)vdev->devh;
+        hldev = vdev->devh;
 
         if (unlikely(!is_vxge_card_up(vdev)))
                 return;
@@ -3989,16 +3989,16 @@ static void __devinit vxge_print_parm(struct vxgedev *vdev, u64 vpath_mask)
                         continue;
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: MTU size - %d", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].mtu);
                 vxge_debug_init(VXGE_TRACE,
                         "%s: VLAN tag stripping %s", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].rpa_strip_vlan_tag
                         ? "Enabled" : "Disabled");
                 vxge_debug_ll_config(VXGE_TRACE,
                         "%s: Max frags : %d", vdev->ndev->name,
-                        ((struct __vxge_hw_device  *)(vdev->devh))->
+                        ((vdev->devh))->
                                 config.vp_config[i].fifo.max_frags);
                 break;
         }
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
index 5954fa264da1..99749bd07d72 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
@@ -533,8 +533,7 @@ __vxge_hw_device_handle_error(struct __vxge_hw_device *hldev, u32 vp_id,
 
         /* notify driver */
         if (hldev->uld_callbacks->crit_err)
-                hldev->uld_callbacks->crit_err(
-                        (struct __vxge_hw_device *)hldev,
+                hldev->uld_callbacks->crit_err(hldev,
                         type, vp_id);
 out:
 
@@ -1322,7 +1321,7 @@ enum vxge_hw_status vxge_hw_ring_rxd_next_completed(
         /* check whether it is not the end */
         if (!own || *t_code == VXGE_HW_RING_T_CODE_FRM_DROP) {
 
-                vxge_assert(((struct vxge_hw_ring_rxd_1 *)rxdp)->host_control !=
+                vxge_assert((rxdp)->host_control !=
                                 0);
 
                 ++ring->cmpl_cnt;