diff options
author | Joe Perches <joe@perches.com> | 2010-05-14 03:19:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-14 03:19:28 -0400 |
commit | a4b770972b8f819e408d7cc3ae9637e15bff62f6 (patch) | |
tree | 62e3c413b084c106d750cf6cc0701709cde30100 /drivers/net/vxge/vxge-config.c | |
parent | 21ce849ba5cc178740c6532ba3dded852296ad91 (diff) |
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>
Diffstat (limited to 'drivers/net/vxge/vxge-config.c')
-rw-r--r-- | drivers/net/vxge/vxge-config.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index a5fc8166c01d..297f0d202073 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) | |||
183 | pci_write_config_word(hldev->pdev, PCI_COMMAND, cmd); | 183 | pci_write_config_word(hldev->pdev, PCI_COMMAND, cmd); |
184 | 184 | ||
185 | pci_save_state(hldev->pdev); | 185 | pci_save_state(hldev->pdev); |
186 | |||
187 | return; | ||
188 | } | 186 | } |
189 | 187 | ||
190 | /* | 188 | /* |
@@ -342,8 +340,6 @@ void __vxge_hw_device_id_get(struct __vxge_hw_device *hldev) | |||
342 | 340 | ||
343 | hldev->minor_revision = | 341 | hldev->minor_revision = |
344 | (u8)VXGE_HW_TITAN_ASIC_ID_GET_INITIAL_MINOR_REVISION(val64); | 342 | (u8)VXGE_HW_TITAN_ASIC_ID_GET_INITIAL_MINOR_REVISION(val64); |
345 | |||
346 | return; | ||
347 | } | 343 | } |
348 | 344 | ||
349 | /* | 345 | /* |
@@ -428,8 +424,6 @@ void __vxge_hw_device_host_info_get(struct __vxge_hw_device *hldev) | |||
428 | hldev->first_vp_id = i; | 424 | hldev->first_vp_id = i; |
429 | break; | 425 | break; |
430 | } | 426 | } |
431 | |||
432 | return; | ||
433 | } | 427 | } |
434 | 428 | ||
435 | /* | 429 | /* |
@@ -1217,8 +1211,6 @@ __vxge_hw_ring_mempool_item_alloc(struct vxge_hw_mempool *mempoolh, | |||
1217 | /* link this RxD block with previous one */ | 1211 | /* link this RxD block with previous one */ |
1218 | __vxge_hw_ring_rxdblock_link(mempoolh, ring, index - 1, index); | 1212 | __vxge_hw_ring_rxdblock_link(mempoolh, ring, index - 1, index); |
1219 | } | 1213 | } |
1220 | |||
1221 | return; | ||
1222 | } | 1214 | } |
1223 | 1215 | ||
1224 | /* | 1216 | /* |
@@ -2318,8 +2310,6 @@ __vxge_hw_fifo_mempool_item_alloc( | |||
2318 | txdl_priv->first_txdp = txdp; | 2310 | txdl_priv->first_txdp = txdp; |
2319 | txdl_priv->next_txdl_priv = NULL; | 2311 | txdl_priv->next_txdl_priv = NULL; |
2320 | txdl_priv->alloc_frags = 0; | 2312 | txdl_priv->alloc_frags = 0; |
2321 | |||
2322 | return; | ||
2323 | } | 2313 | } |
2324 | 2314 | ||
2325 | /* | 2315 | /* |
@@ -2576,7 +2566,6 @@ __vxge_hw_read_rts_ds(struct vxge_hw_vpath_reg __iomem *vpath_reg, | |||
2576 | writeq(dta_struct_sel, &vpath_reg->rts_access_steer_data0); | 2566 | writeq(dta_struct_sel, &vpath_reg->rts_access_steer_data0); |
2577 | writeq(0, &vpath_reg->rts_access_steer_data1); | 2567 | writeq(0, &vpath_reg->rts_access_steer_data1); |
2578 | wmb(); | 2568 | wmb(); |
2579 | return; | ||
2580 | } | 2569 | } |
2581 | 2570 | ||
2582 | 2571 | ||
@@ -3484,7 +3473,6 @@ __vxge_hw_vpath_prc_configure(struct __vxge_hw_device *hldev, u32 vp_id) | |||
3484 | val64 &= ~VXGE_HW_PRC_CFG4_RTH_DISABLE; | 3473 | val64 &= ~VXGE_HW_PRC_CFG4_RTH_DISABLE; |
3485 | 3474 | ||
3486 | writeq(val64, &vp_reg->prc_cfg4); | 3475 | writeq(val64, &vp_reg->prc_cfg4); |
3487 | return; | ||
3488 | } | 3476 | } |
3489 | 3477 | ||
3490 | /* | 3478 | /* |
@@ -3903,7 +3891,6 @@ vxge_hw_vpath_tti_ci_set(struct __vxge_hw_device *hldev, u32 vp_id) | |||
3903 | &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]); | 3891 | &vp_reg->tim_cfg1_int_num[VXGE_HW_VPATH_INTR_TX]); |
3904 | } | 3892 | } |
3905 | } | 3893 | } |
3906 | return; | ||
3907 | } | 3894 | } |
3908 | /* | 3895 | /* |
3909 | * __vxge_hw_vpath_initialize | 3896 | * __vxge_hw_vpath_initialize |
@@ -5037,8 +5024,6 @@ __vxge_hw_blockpool_free(struct __vxge_hw_device *devh, | |||
5037 | if (status == VXGE_HW_OK) | 5024 | if (status == VXGE_HW_OK) |
5038 | __vxge_hw_blockpool_blocks_remove(blockpool); | 5025 | __vxge_hw_blockpool_blocks_remove(blockpool); |
5039 | } | 5026 | } |
5040 | |||
5041 | return; | ||
5042 | } | 5027 | } |
5043 | 5028 | ||
5044 | /* | 5029 | /* |
@@ -5094,6 +5079,4 @@ __vxge_hw_blockpool_block_free(struct __vxge_hw_device *devh, | |||
5094 | } | 5079 | } |
5095 | 5080 | ||
5096 | __vxge_hw_blockpool_blocks_remove(blockpool); | 5081 | __vxge_hw_blockpool_blocks_remove(blockpool); |
5097 | |||
5098 | return; | ||
5099 | } | 5082 | } |