diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-04-13 20:27:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-14 15:35:12 -0400 |
commit | 19a898601ad192d8c59c3a8f1a4501919f53b94d (patch) | |
tree | 4d1405ad86f7c69ef63cbdc6dca3dc5e34f844da /drivers | |
parent | 600f5d909a54a8dccf8c8c23898fc2e91bc0953e (diff) |
mwifiex: remove redundant "return" at end of void function
The return statement at the last line of a void function
is not necessary.
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/mwifiex/11n.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/11n_rxreorder.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/cmdevt.c | 13 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/debugfs.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/init.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/sdio.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/wmm.c | 2 |
10 files changed, 1 insertions, 44 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c index edf4c274fa9b..c57107a860d1 100644 --- a/drivers/net/wireless/mwifiex/11n.c +++ b/drivers/net/wireless/mwifiex/11n.c | |||
@@ -543,8 +543,6 @@ mwifiex_cfg_tx_buf(struct mwifiex_private *priv, | |||
543 | if (curr_tx_buf_size != tx_buf) | 543 | if (curr_tx_buf_size != tx_buf) |
544 | mwifiex_send_cmd_async(priv, HostCmd_CMD_RECONFIGURE_TX_BUFF, | 544 | mwifiex_send_cmd_async(priv, HostCmd_CMD_RECONFIGURE_TX_BUFF, |
545 | HostCmd_ACT_GEN_SET, 0, &tx_buf); | 545 | HostCmd_ACT_GEN_SET, 0, &tx_buf); |
546 | |||
547 | return; | ||
548 | } | 546 | } |
549 | 547 | ||
550 | /* | 548 | /* |
@@ -582,8 +580,6 @@ void mwifiex_11n_delete_tx_ba_stream_tbl_entry(struct mwifiex_private *priv, | |||
582 | list_del(&tx_ba_tsr_tbl->list); | 580 | list_del(&tx_ba_tsr_tbl->list); |
583 | 581 | ||
584 | kfree(tx_ba_tsr_tbl); | 582 | kfree(tx_ba_tsr_tbl); |
585 | |||
586 | return; | ||
587 | } | 583 | } |
588 | 584 | ||
589 | /* | 585 | /* |
@@ -662,8 +658,6 @@ void mwifiex_11n_create_tx_ba_stream_tbl(struct mwifiex_private *priv, | |||
662 | list_add_tail(&new_node->list, &priv->tx_ba_stream_tbl_ptr); | 658 | list_add_tail(&new_node->list, &priv->tx_ba_stream_tbl_ptr); |
663 | spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags); | 659 | spin_unlock_irqrestore(&priv->tx_ba_stream_tbl_lock, flags); |
664 | } | 660 | } |
665 | |||
666 | return; | ||
667 | } | 661 | } |
668 | 662 | ||
669 | /* | 663 | /* |
diff --git a/drivers/net/wireless/mwifiex/11n_rxreorder.c b/drivers/net/wireless/mwifiex/11n_rxreorder.c index ef46d0a8a6d0..6736fc604844 100644 --- a/drivers/net/wireless/mwifiex/11n_rxreorder.c +++ b/drivers/net/wireless/mwifiex/11n_rxreorder.c | |||
@@ -309,8 +309,6 @@ mwifiex_11n_create_rx_reorder_tbl(struct mwifiex_private *priv, u8 *ta, | |||
309 | spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags); | 309 | spin_lock_irqsave(&priv->rx_reorder_tbl_lock, flags); |
310 | list_add_tail(&new_node->list, &priv->rx_reorder_tbl_ptr); | 310 | list_add_tail(&new_node->list, &priv->rx_reorder_tbl_ptr); |
311 | spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags); | 311 | spin_unlock_irqrestore(&priv->rx_reorder_tbl_lock, flags); |
312 | |||
313 | return; | ||
314 | } | 312 | } |
315 | 313 | ||
316 | /* | 314 | /* |
@@ -610,8 +608,6 @@ void mwifiex_11n_ba_stream_timeout(struct mwifiex_private *priv, | |||
610 | (u16) event->origninator << DELBA_INITIATOR_POS); | 608 | (u16) event->origninator << DELBA_INITIATOR_POS); |
611 | delba.reason_code = cpu_to_le16(WLAN_REASON_QSTA_TIMEOUT); | 609 | delba.reason_code = cpu_to_le16(WLAN_REASON_QSTA_TIMEOUT); |
612 | mwifiex_send_cmd_async(priv, HostCmd_CMD_11N_DELBA, 0, 0, &delba); | 610 | mwifiex_send_cmd_async(priv, HostCmd_CMD_11N_DELBA, 0, 0, &delba); |
613 | |||
614 | return; | ||
615 | } | 611 | } |
616 | 612 | ||
617 | /* | 613 | /* |
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index a1ff490da836..74b6cf20da04 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c | |||
@@ -1428,6 +1428,4 @@ done: | |||
1428 | memset(priv->cfg_bssid, 0, ETH_ALEN); | 1428 | memset(priv->cfg_bssid, 0, ETH_ALEN); |
1429 | priv->disconnect = 0; | 1429 | priv->disconnect = 0; |
1430 | } | 1430 | } |
1431 | |||
1432 | return; | ||
1433 | } | 1431 | } |
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c index bb6fecd77619..776146a104ec 100644 --- a/drivers/net/wireless/mwifiex/cmdevt.c +++ b/drivers/net/wireless/mwifiex/cmdevt.c | |||
@@ -94,8 +94,6 @@ mwifiex_clean_cmd_node(struct mwifiex_adapter *adapter, | |||
94 | mwifiex_recv_complete(adapter, cmd_node->resp_skb, 0); | 94 | mwifiex_recv_complete(adapter, cmd_node->resp_skb, 0); |
95 | cmd_node->resp_skb = NULL; | 95 | cmd_node->resp_skb = NULL; |
96 | } | 96 | } |
97 | |||
98 | return; | ||
99 | } | 97 | } |
100 | 98 | ||
101 | /* | 99 | /* |
@@ -536,7 +534,7 @@ mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter, | |||
536 | { | 534 | { |
537 | unsigned long flags; | 535 | unsigned long flags; |
538 | 536 | ||
539 | if (cmd_node == NULL) | 537 | if (!cmd_node) |
540 | return; | 538 | return; |
541 | 539 | ||
542 | if (cmd_node->wait_q_enabled) | 540 | if (cmd_node->wait_q_enabled) |
@@ -548,8 +546,6 @@ mwifiex_insert_cmd_to_free_q(struct mwifiex_adapter *adapter, | |||
548 | spin_lock_irqsave(&adapter->cmd_free_q_lock, flags); | 546 | spin_lock_irqsave(&adapter->cmd_free_q_lock, flags); |
549 | list_add_tail(&cmd_node->list, &adapter->cmd_free_q); | 547 | list_add_tail(&cmd_node->list, &adapter->cmd_free_q); |
550 | spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags); | 548 | spin_unlock_irqrestore(&adapter->cmd_free_q_lock, flags); |
551 | |||
552 | return; | ||
553 | } | 549 | } |
554 | 550 | ||
555 | /* | 551 | /* |
@@ -594,8 +590,6 @@ mwifiex_insert_cmd_to_pending_q(struct mwifiex_adapter *adapter, | |||
594 | spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags); | 590 | spin_unlock_irqrestore(&adapter->cmd_pending_q_lock, flags); |
595 | 591 | ||
596 | dev_dbg(adapter->dev, "cmd: QUEUE_CMD: cmd=%#x is queued\n", command); | 592 | dev_dbg(adapter->dev, "cmd: QUEUE_CMD: cmd=%#x is queued\n", command); |
597 | |||
598 | return; | ||
599 | } | 593 | } |
600 | 594 | ||
601 | /* | 595 | /* |
@@ -871,8 +865,6 @@ mwifiex_cmd_timeout_func(unsigned long function_context) | |||
871 | } | 865 | } |
872 | if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) | 866 | if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) |
873 | mwifiex_init_fw_complete(adapter); | 867 | mwifiex_init_fw_complete(adapter); |
874 | |||
875 | return; | ||
876 | } | 868 | } |
877 | 869 | ||
878 | /* | 870 | /* |
@@ -989,8 +981,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter) | |||
989 | } | 981 | } |
990 | adapter->cmd_wait_q.status = -1; | 982 | adapter->cmd_wait_q.status = -1; |
991 | mwifiex_complete_cmd(adapter); | 983 | mwifiex_complete_cmd(adapter); |
992 | |||
993 | return; | ||
994 | } | 984 | } |
995 | 985 | ||
996 | /* | 986 | /* |
@@ -1094,7 +1084,6 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter) | |||
1094 | adapter->is_hs_configured = false; | 1084 | adapter->is_hs_configured = false; |
1095 | mwifiex_hs_activated_event(mwifiex_get_priv(adapter, | 1085 | mwifiex_hs_activated_event(mwifiex_get_priv(adapter, |
1096 | MWIFIEX_BSS_ROLE_ANY), false); | 1086 | MWIFIEX_BSS_ROLE_ANY), false); |
1097 | return; | ||
1098 | } | 1087 | } |
1099 | 1088 | ||
1100 | /* | 1089 | /* |
diff --git a/drivers/net/wireless/mwifiex/debugfs.c b/drivers/net/wireless/mwifiex/debugfs.c index 77d7c777ea66..7ddcb062f103 100644 --- a/drivers/net/wireless/mwifiex/debugfs.c +++ b/drivers/net/wireless/mwifiex/debugfs.c | |||
@@ -735,8 +735,6 @@ mwifiex_dev_debugfs_init(struct mwifiex_private *priv) | |||
735 | MWIFIEX_DFS_ADD_FILE(getlog); | 735 | MWIFIEX_DFS_ADD_FILE(getlog); |
736 | MWIFIEX_DFS_ADD_FILE(regrdwr); | 736 | MWIFIEX_DFS_ADD_FILE(regrdwr); |
737 | MWIFIEX_DFS_ADD_FILE(rdeeprom); | 737 | MWIFIEX_DFS_ADD_FILE(rdeeprom); |
738 | |||
739 | return; | ||
740 | } | 738 | } |
741 | 739 | ||
742 | /* | 740 | /* |
@@ -749,7 +747,6 @@ mwifiex_dev_debugfs_remove(struct mwifiex_private *priv) | |||
749 | return; | 747 | return; |
750 | 748 | ||
751 | debugfs_remove_recursive(priv->dfs_dev_dir); | 749 | debugfs_remove_recursive(priv->dfs_dev_dir); |
752 | return; | ||
753 | } | 750 | } |
754 | 751 | ||
755 | /* | 752 | /* |
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c index 26931d5f950f..1b79a5ac9214 100644 --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c | |||
@@ -299,8 +299,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) | |||
299 | adapter->adhoc_awake_period = 0; | 299 | adapter->adhoc_awake_period = 0; |
300 | memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter)); | 300 | memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter)); |
301 | adapter->arp_filter_size = 0; | 301 | adapter->arp_filter_size = 0; |
302 | |||
303 | return; | ||
304 | } | 302 | } |
305 | 303 | ||
306 | /* | 304 | /* |
@@ -339,8 +337,6 @@ mwifiex_free_adapter(struct mwifiex_adapter *adapter) | |||
339 | adapter->if_ops.cleanup_if(adapter); | 337 | adapter->if_ops.cleanup_if(adapter); |
340 | 338 | ||
341 | dev_kfree_skb_any(adapter->sleep_cfm); | 339 | dev_kfree_skb_any(adapter->sleep_cfm); |
342 | |||
343 | return; | ||
344 | } | 340 | } |
345 | 341 | ||
346 | /* | 342 | /* |
@@ -428,8 +424,6 @@ void mwifiex_free_lock_list(struct mwifiex_adapter *adapter) | |||
428 | list_del(&priv->rx_reorder_tbl_ptr); | 424 | list_del(&priv->rx_reorder_tbl_ptr); |
429 | } | 425 | } |
430 | } | 426 | } |
431 | |||
432 | return; | ||
433 | } | 427 | } |
434 | 428 | ||
435 | /* | 429 | /* |
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index df665db8c433..77abfc3d6c32 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c | |||
@@ -505,7 +505,6 @@ mwifiex_fill_buffer(struct sk_buff *skb) | |||
505 | */ | 505 | */ |
506 | do_gettimeofday(&tv); | 506 | do_gettimeofday(&tv); |
507 | skb->tstamp = timeval_to_ktime(tv); | 507 | skb->tstamp = timeval_to_ktime(tv); |
508 | return; | ||
509 | } | 508 | } |
510 | 509 | ||
511 | /* | 510 | /* |
@@ -820,8 +819,6 @@ mwifiex_remove_interface(struct mwifiex_adapter *adapter, u8 bss_index) | |||
820 | wiphy_unregister(priv->wdev->wiphy); | 819 | wiphy_unregister(priv->wdev->wiphy); |
821 | wiphy_free(priv->wdev->wiphy); | 820 | wiphy_free(priv->wdev->wiphy); |
822 | kfree(priv->wdev); | 821 | kfree(priv->wdev); |
823 | |||
824 | return; | ||
825 | } | 822 | } |
826 | 823 | ||
827 | /* | 824 | /* |
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index f207756cbb79..fa46df509757 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c | |||
@@ -859,8 +859,6 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter) | |||
859 | adapter->int_status |= sdio_ireg; | 859 | adapter->int_status |= sdio_ireg; |
860 | spin_unlock_irqrestore(&adapter->int_lock, flags); | 860 | spin_unlock_irqrestore(&adapter->int_lock, flags); |
861 | } | 861 | } |
862 | |||
863 | return; | ||
864 | } | 862 | } |
865 | 863 | ||
866 | /* | 864 | /* |
@@ -891,8 +889,6 @@ mwifiex_sdio_interrupt(struct sdio_func *func) | |||
891 | 889 | ||
892 | mwifiex_interrupt_status(adapter); | 890 | mwifiex_interrupt_status(adapter); |
893 | queue_work(adapter->workqueue, &adapter->main_work); | 891 | queue_work(adapter->workqueue, &adapter->main_work); |
894 | |||
895 | return; | ||
896 | } | 892 | } |
897 | 893 | ||
898 | /* | 894 | /* |
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c index 8743c116bee5..20ce8cb39186 100644 --- a/drivers/net/wireless/mwifiex/sta_cmdresp.c +++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c | |||
@@ -103,8 +103,6 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv, | |||
103 | spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags); | 103 | spin_lock_irqsave(&adapter->mwifiex_cmd_lock, flags); |
104 | adapter->curr_cmd = NULL; | 104 | adapter->curr_cmd = NULL; |
105 | spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags); | 105 | spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags); |
106 | |||
107 | return; | ||
108 | } | 106 | } |
109 | 107 | ||
110 | /* | 108 | /* |
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c index 1cfbc6bed692..6ce6f94e222b 100644 --- a/drivers/net/wireless/mwifiex/wmm.c +++ b/drivers/net/wireless/mwifiex/wmm.c | |||
@@ -1232,6 +1232,4 @@ mwifiex_wmm_process_tx(struct mwifiex_adapter *adapter) | |||
1232 | if (mwifiex_dequeue_tx_packet(adapter)) | 1232 | if (mwifiex_dequeue_tx_packet(adapter)) |
1233 | break; | 1233 | break; |
1234 | } while (true); | 1234 | } while (true); |
1235 | |||
1236 | return; | ||
1237 | } | 1235 | } |