drivers/net: Remove unnecessary returns from void function()s

This patch removes from drivers/net/ all the unnecessary
return; statements that precede the last closing brace of
void functions.

It does not remove the returns that are immediately
preceded by a label as gcc doesn't like that.

It also does not remove null void functions with return.

Done via:
$ grep -rP --include=*.[ch] -l "return;\n}" net/ | \
  xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }'

with some cleanups by hand.

Compile tested x86 allmodconfig only.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 0 insertions, 49 deletions

diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c
index a5fc8166c01..297f0d20207 100644
--- a/drivers/net/vxge/vxge-config.c
+++ b/drivers/net/vxge/vxge-config.c
@@ -183,8 +183,6 @@ __vxge_hw_device_pci_e_init(struct __vxge_hw_device *hldev)
         pci_write_config_word(hldev->pdev, PCI_COMMAND, cmd);
 
         pci_save_state(hldev->pdev);
-
-        return;
 }
 
 /*
@@ -342,8 +340,6 @@ void __vxge_hw_device_id_get(struct __vxge_hw_device *hldev)
 
         hldev->minor_revision =
                 (u8)VXGE_HW_TITAN_ASIC_ID_GET_INITIAL_MINOR_REVISION(val64);
-
-        return;
 }
 
 /*
@@ -428,8 +424,6 @@ void __vxge_hw_device_host_info_get(struct __vxge_hw_device *hldev)
                 hldev->first_vp_id = i;
                 break;
         }
-
-        return;
 }
 
 /*
@@ -1217,8 +1211,6 @@ __vxge_hw_ring_mempool_item_alloc(struct vxge_hw_mempool *mempoolh,
                 /* link this RxD block with previous one */
                 __vxge_hw_ring_rxdblock_link(mempoolh, ring, index - 1, index);
         }
-
-        return;
 }
 
 /*
@@ -2318,8 +2310,6 @@ __vxge_hw_fifo_mempool_item_alloc(
         txdl_priv->first_txdp = txdp;
         txdl_priv->next_txdl_priv = NULL;
         txdl_priv->alloc_frags = 0;
-
-        return;
 }
 
 /*
@@ -2576,7 +2566,6 @@ __vxge_hw_read_rts_ds(struct vxge_hw_vpath_reg __iomem *vpath_reg,
         writeq(dta_struct_sel, &vpath_reg->rts_access_steer_data0);
         writeq(0, &vpath_reg->rts_access_steer_data1);
         wmb();
-        return;
 }
 
 
@@ -3484,7 +3473,6 @@ __vxge_hw_vpath_prc_configure(struct __vxge_hw_device *hldev, u32 vp_id)
                 val64 &= ~VXGE_HW_PRC_CFG4_RTH_DISABLE;
 
         writeq(val64, &vp_reg->prc_cfg4);
-        return;
 }
 
 /*
@@ -3903,7 +3891,6 @@ vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id)
                         &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]);
                 }
         }
-        return;
 }
 /*
  * __vxge_hw_vpath_initialize
@@ -5037,8 +5024,6 @@ __vxge_hw_blockpool_free(struct __vxge_hw_device *devh,
                 if (status == VXGE_HW_OK)
                         __vxge_hw_blockpool_blocks_remove(blockpool);
         }
-
-        return;
 }
 
 /*
@@ -5094,6 +5079,4 @@ __vxge_hw_blockpool_block_free(struct __vxge_hw_device *devh,
         }
 
         __vxge_hw_blockpool_blocks_remove(blockpool);
-
-        return;
 }
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 2bab36421f7..b504bd56136 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -1764,7 +1764,6 @@ static void vxge_netpoll(struct net_device *dev)
 
         vxge_debug_entryexit(VXGE_TRACE,
                 "%s:%d  Exiting...", __func__, __LINE__);
-        return;
 }
 #endif
 
@@ -2815,7 +2814,6 @@ static void vxge_napi_del_all(struct vxgedev *vdev)
                 for (i = 0; i < vdev->no_of_vpath; i++)
                         netif_napi_del(&vdev->vpaths[i].ring.napi);
         }
-        return;
 }
 
 int do_vxge_close(struct net_device *dev, int do_io)
@@ -3500,8 +3498,6 @@ static void verify_bandwidth(void)
                 for (i = 1; i < VXGE_HW_MAX_VIRTUAL_PATHS; i++)
                         bw_percentage[i] = bw_percentage[0];
         }
-
-        return;
 }
 
 /*
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/vxge/vxge-traffic.c
index f83e6aee3f6..6cc1dd79b40 100644
--- a/drivers/net/vxge/vxge-traffic.c
+++ b/drivers/net/vxge/vxge-traffic.c
@@ -233,8 +233,6 @@ void vxge_hw_channel_msix_mask(struct __vxge_hw_channel *channel, int msix_id)
         __vxge_hw_pio_mem_write32_upper(
                 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                 &channel->common_reg->set_msix_mask_vect[msix_id%4]);
-
-        return;
 }
 
 /**
@@ -253,8 +251,6 @@ vxge_hw_channel_msix_unmask(struct __vxge_hw_channel *channel, int msix_id)
         __vxge_hw_pio_mem_write32_upper(
                 (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                 &channel->common_reg->clear_msix_mask_vect[msix_id%4]);
-
-        return;
 }
 
 /**
@@ -329,8 +325,6 @@ void vxge_hw_device_intr_enable(struct __vxge_hw_device *hldev)
         val64 = readq(&hldev->common_reg->titan_general_int_status);
 
         vxge_hw_device_unmask_all(hldev);
-
-        return;
 }
 
 /**
@@ -362,8 +356,6 @@ void vxge_hw_device_intr_disable(struct __vxge_hw_device *hldev)
                 vxge_hw_vpath_intr_disable(
                         VXGE_HW_VIRTUAL_PATH_HANDLE(&hldev->virtual_paths[i]));
         }
-
-        return;
 }
 
 /**
@@ -383,8 +375,6 @@ void vxge_hw_device_mask_all(struct __vxge_hw_device *hldev)
 
         __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32),
                                 &hldev->common_reg->titan_mask_all_int);
-
-        return;
 }
 
 /**
@@ -404,8 +394,6 @@ void vxge_hw_device_unmask_all(struct __vxge_hw_device *hldev)
 
         __vxge_hw_pio_mem_write32_upper((u32)vxge_bVALn(val64, 0, 32),
                         &hldev->common_reg->titan_mask_all_int);
-
-        return;
 }
 
 /**
@@ -647,8 +635,6 @@ void vxge_hw_device_clear_tx_rx(struct __vxge_hw_device *hldev)
                                  hldev->tim_int_mask1[VXGE_HW_VPATH_INTR_RX]),
                                 &hldev->common_reg->tim_int_status1);
         }
-
-        return;
 }
 
 /*
@@ -2255,8 +2241,6 @@ vxge_hw_vpath_msix_set(struct __vxge_hw_vpath_handle *vp, int *tim_msix_id,
                                 VXGE_HW_ONE_SHOT_VECT3_EN_ONE_SHOT_VECT3_EN,
                                 0, 32), &vp_reg->one_shot_vect3_en);
         }
-
-        return;
 }
 
 /**
@@ -2278,8 +2262,6 @@ vxge_hw_vpath_msix_mask(struct __vxge_hw_vpath_handle *vp, int msix_id)
         __vxge_hw_pio_mem_write32_upper(
                 (u32) vxge_bVALn(vxge_mBIT(msix_id  >> 2), 0, 32),
                 &hldev->common_reg->set_msix_mask_vect[msix_id % 4]);
-
-        return;
 }
 
 /**
@@ -2310,8 +2292,6 @@ vxge_hw_vpath_msix_clear(struct __vxge_hw_vpath_handle *vp, int msix_id)
                                 &hldev->common_reg->
                                         clear_msix_mask_vect[msix_id%4]);
         }
-
-        return;
 }
 
 /**
@@ -2333,8 +2313,6 @@ vxge_hw_vpath_msix_unmask(struct __vxge_hw_vpath_handle *vp, int msix_id)
         __vxge_hw_pio_mem_write32_upper(
                         (u32)vxge_bVALn(vxge_mBIT(msix_id >> 2), 0, 32),
                         &hldev->common_reg->clear_msix_mask_vect[msix_id%4]);
-
-        return;
 }
 
 /**
@@ -2351,8 +2329,6 @@ vxge_hw_vpath_msix_mask_all(struct __vxge_hw_vpath_handle *vp)
         __vxge_hw_pio_mem_write32_upper(
                 (u32)vxge_bVALn(vxge_mBIT(vp->vpath->vp_id), 0, 32),
                 &vp->vpath->hldev->common_reg->set_msix_mask_all_vect);
-
-        return;
 }
 
 /**
@@ -2391,8 +2367,6 @@ void vxge_hw_vpath_inta_mask_tx_rx(struct __vxge_hw_vpath_handle *vp)
                         tim_int_mask1[VXGE_HW_VPATH_INTR_RX] | val64),
                         &hldev->common_reg->tim_int_mask1);
         }
-
-        return;
 }
 
 /**
@@ -2429,8 +2403,6 @@ void vxge_hw_vpath_inta_unmask_tx_rx(struct __vxge_hw_vpath_handle *vp)
                           tim_int_mask1[VXGE_HW_VPATH_INTR_RX])) & val64,
                         &hldev->common_reg->tim_int_mask1);
         }
-
-        return;
 }
 
 /**