diff options
author | Avinash Patil <patila@marvell.com> | 2014-11-05 06:34:28 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-11-11 16:31:12 -0500 |
commit | 041bfab5bbb6ec721c743f487e3e22b87f666996 (patch) | |
tree | 1b485b2f37b255c05e7111aa8d3db7cef6a23e4f | |
parent | ec4a16b4d287d4d0f7465ae7e61ce4e9021d715c (diff) |
mwifiex: remove data_complete handler
This patch removes redundant data complete handler.
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/txrx.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/usb.c | 6 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index c7fdd8238f45..4ef3c7a8f9fb 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -686,7 +686,6 @@ struct mwifiex_if_ops { | |||
686 | void (*cleanup_mpa_buf) (struct mwifiex_adapter *); | 686 | void (*cleanup_mpa_buf) (struct mwifiex_adapter *); |
687 | int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *); | 687 | int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *); |
688 | int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *); | 688 | int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *); |
689 | int (*data_complete) (struct mwifiex_adapter *); | ||
690 | int (*init_fw_port) (struct mwifiex_adapter *); | 689 | int (*init_fw_port) (struct mwifiex_adapter *); |
691 | int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *); | 690 | int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *); |
692 | void (*card_reset) (struct mwifiex_adapter *); | 691 | void (*card_reset) (struct mwifiex_adapter *); |
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c index 96a2126cc44b..a5983fc4e83a 100644 --- a/drivers/net/wireless/mwifiex/txrx.c +++ b/drivers/net/wireless/mwifiex/txrx.c | |||
@@ -64,10 +64,6 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter, | |||
64 | else | 64 | else |
65 | ret = mwifiex_process_sta_rx_packet(priv, skb); | 65 | ret = mwifiex_process_sta_rx_packet(priv, skb); |
66 | 66 | ||
67 | /* Decrement RX pending counter for each packet */ | ||
68 | if (adapter->if_ops.data_complete) | ||
69 | adapter->if_ops.data_complete(adapter); | ||
70 | |||
71 | return ret; | 67 | return ret; |
72 | } | 68 | } |
73 | EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet); | 69 | EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet); |
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c index 00afcf63845e..08e9ec065275 100644 --- a/drivers/net/wireless/mwifiex/usb.c +++ b/drivers/net/wireless/mwifiex/usb.c | |||
@@ -967,11 +967,6 @@ static int mwifiex_usb_cmd_event_complete(struct mwifiex_adapter *adapter, | |||
967 | return 0; | 967 | return 0; |
968 | } | 968 | } |
969 | 969 | ||
970 | static int mwifiex_usb_data_complete(struct mwifiex_adapter *adapter) | ||
971 | { | ||
972 | return 0; | ||
973 | } | ||
974 | |||
975 | /* This function wakes up the card. */ | 970 | /* This function wakes up the card. */ |
976 | static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter) | 971 | static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter) |
977 | { | 972 | { |
@@ -993,7 +988,6 @@ static struct mwifiex_if_ops usb_ops = { | |||
993 | .dnld_fw = mwifiex_usb_dnld_fw, | 988 | .dnld_fw = mwifiex_usb_dnld_fw, |
994 | .cmdrsp_complete = mwifiex_usb_cmd_event_complete, | 989 | .cmdrsp_complete = mwifiex_usb_cmd_event_complete, |
995 | .event_complete = mwifiex_usb_cmd_event_complete, | 990 | .event_complete = mwifiex_usb_cmd_event_complete, |
996 | .data_complete = mwifiex_usb_data_complete, | ||
997 | .host_to_card = mwifiex_usb_host_to_card, | 991 | .host_to_card = mwifiex_usb_host_to_card, |
998 | }; | 992 | }; |
999 | 993 | ||