diff options
| author | Ryan Hsu <ryanhsu@qca.qualcomm.com> | 2016-04-12 17:31:49 -0700 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-04-20 18:26:25 +0530 |
| commit | 4be1025d9acdcb5bb6289727375d6a5631704f3f (patch) | |
| tree | 0567134b38b34e9e17be8bffeebe5c68cb1f93b3 | |
| parent | 9961d1e9372cb0aa2f86cb283f6957380122890d (diff) | |
qcacld-2.0: Clean up the ptt_pid parameter from nl_srv_exit()
The parameter ptt_pid sending to nl_srv_exit() is no longer required.
So clean it up here.
Change-Id: If234286e04f2222ec9a8682414f6710c16cb34a9
CRs-fixed: 1002615
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_early_suspend.c | 4 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 10 | ||||
| -rw-r--r-- | CORE/SVC/inc/wlan_nlink_srv.h | 13 | ||||
| -rw-r--r-- | CORE/SVC/src/nlink/wlan_nlink_srv.c | 4 |
4 files changed, 1 insertions, 30 deletions
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c index 66170074c6bc..d95b096c8b50 100644 --- a/CORE/HDD/src/wlan_hdd_early_suspend.c +++ b/CORE/HDD/src/wlan_hdd_early_suspend.c @@ -2349,11 +2349,7 @@ err_vosclose: unregister_netdevice_notifier(&hdd_netdev_notifier); /* Clean up HDD Nlink Service */ send_btc_nlink_msg(WLAN_MODULE_DOWN_IND, 0); -#ifdef WLAN_KD_READY_NOTIFIER - nl_srv_exit(pHddCtx->ptt_pid); -#else nl_srv_exit(); -#endif /* WLAN_KD_READY_NOTIFIER */ /* Free up dynamically allocated members inside HDD Adapter */ kfree(pHddCtx->cfg_ini); pHddCtx->cfg_ini= NULL; diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 398eb681f30a..93579caf8c9a 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -12883,12 +12883,7 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx) wlan_hdd_send_status_pkg(NULL, NULL, 0, 0); #endif -#ifdef WLAN_KD_READY_NOTIFIER - nl_srv_exit(pHddCtx->ptt_pid); -#else nl_srv_exit(); -#endif /* WLAN_KD_READY_NOTIFIER */ - hdd_close_cesium_nl_sock(); hdd_runtime_suspend_deinit(pHddCtx); @@ -15113,12 +15108,7 @@ int hdd_wlan_startup(struct device *dev, v_VOID_t *hif_sc) goto success; err_nl_srv: -#ifdef WLAN_KD_READY_NOTIFIER - nl_srv_exit(pHddCtx->ptt_pid); -#else nl_srv_exit(); -#endif /* WLAN_KD_READY_NOTIFIER */ - hdd_close_cesium_nl_sock(); err_reg_netdev: diff --git a/CORE/SVC/inc/wlan_nlink_srv.h b/CORE/SVC/inc/wlan_nlink_srv.h index b84eb6779404..df7214421be8 100644 --- a/CORE/SVC/inc/wlan_nlink_srv.h +++ b/CORE/SVC/inc/wlan_nlink_srv.h @@ -59,11 +59,7 @@ typedef int (* nl_srv_msg_callback)(struct sk_buff * skb); #ifndef MULTI_IF_NAME int nl_srv_init(void); -#ifdef WLAN_KD_READY_NOTIFIER -void nl_srv_exit(int dst_pid); -#else void nl_srv_exit(void); -#endif /* WLAN_KD_READY_NOTIFIER */ int nl_srv_register(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler); int nl_srv_unregister(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler); int nl_srv_ucast(struct sk_buff * skb, int dst_pid, int flag); @@ -72,14 +68,7 @@ int nl_srv_is_initialized(void); #else static inline int nl_srv_init(void) { return 0; } - -#ifdef WLAN_KD_READY_NOTIFIER -static inline void nl_srv_exit(int dst_pid) -#else -void nl_srv_exit(void) -#endif /* WLAN_KD_READY_NOTIFIER */ -{ -} +static inline void nl_srv_exit(void) {} static inline int nl_srv_register(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler) diff --git a/CORE/SVC/src/nlink/wlan_nlink_srv.c b/CORE/SVC/src/nlink/wlan_nlink_srv.c index 8512bf0f5305..275e70715d1b 100644 --- a/CORE/SVC/src/nlink/wlan_nlink_srv.c +++ b/CORE/SVC/src/nlink/wlan_nlink_srv.c @@ -101,11 +101,7 @@ int nl_srv_init(void) * Deinit the netlink service. * Netlink service is unusable after this. */ -#ifdef WLAN_KD_READY_NOTIFIER -void nl_srv_exit(int dst_pid) -#else void nl_srv_exit(void) -#endif /* WLAN_KD_READY_NOTIFIER */ { netlink_kernel_release(nl_srv_sock); nl_srv_sock = NULL; |