From f2e2fac99e073bebb58576fdfa0c94d992ad1585 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Fri, 2 Mar 2018 15:34:22 -0800 Subject: [PATCH] qcacld-3.0: Remove pmo_core_wow_[enter|exit]() pmo_core_wow_enter(), pmo_core_wow_exit() and struct pmo_wow_enter_params are all dead code. Remove them. Change-Id: I254a0bad794ffc1170a2799918e1627a3e01e340 CRs-Fixed: 2199462 --- components/pmo/core/inc/wlan_pmo_wow.h | 24 +------------------ components/pmo/core/src/wlan_pmo_wow.c | 15 ++---------- .../inc/wlan_pmo_wow_public_struct.h | 18 +------------- 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/components/pmo/core/inc/wlan_pmo_wow.h b/components/pmo/core/inc/wlan_pmo_wow.h index eba3f62db1bc..84b58916df45 100644 --- a/components/pmo/core/inc/wlan_pmo_wow.h +++ b/components/pmo/core/inc/wlan_pmo_wow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -316,28 +316,6 @@ QDF_STATUS pmo_core_add_wow_user_pattern(struct wlan_objmgr_vdev *vdev, QDF_STATUS pmo_core_del_wow_user_pattern(struct wlan_objmgr_vdev *vdev, uint8_t pattern_id); -/** - * pmo_core_wow_enter() - store enable/disable status for pattern - * @wma: wma handle - * @info: wow parameters - * - * Records pattern enable/disable status locally. This choice will - * take effect when the driver enter into suspend state. - * - * Return: QDF status - */ -QDF_STATUS pmo_core_wow_enter(struct wlan_objmgr_vdev *vdev, - struct pmo_wow_enter_params *wow_enter_param); - -/** - * pmo_core_wow_exit() - clear all wma states - * @wma: wma handle - * @info: wow params - * - * Return: QDF status - */ -QDF_STATUS pmo_core_wow_exit(struct wlan_objmgr_vdev *vdev); - /** * pmo_core_enable_wakeup_event() - enable wow wakeup events * @psoc: objmgr psoc diff --git a/components/pmo/core/src/wlan_pmo_wow.c b/components/pmo/core/src/wlan_pmo_wow.c index 10e1081e466d..6b4a2b74fd0a 100644 --- a/components/pmo/core/src/wlan_pmo_wow.c +++ b/components/pmo/core/src/wlan_pmo_wow.c @@ -127,25 +127,14 @@ out: return status; } - -QDF_STATUS pmo_core_wow_enter(struct wlan_objmgr_vdev *vdev, - struct pmo_wow_enter_params *wow_enter_param) -{ - return QDF_STATUS_SUCCESS; -} - -QDF_STATUS pmo_core_wow_exit(struct wlan_objmgr_vdev *vdev) -{ - return QDF_STATUS_SUCCESS; -} - void pmo_core_enable_wakeup_event(struct wlan_objmgr_psoc *psoc, - uint32_t vdev_id, uint32_t *bitmap) + uint32_t vdev_id, uint32_t *bitmap) { QDF_STATUS status; struct wlan_objmgr_vdev *vdev; PMO_ENTER(); + if (!psoc) { pmo_err("psoc is null"); goto out; diff --git a/components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h b/components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h index cd7751fea2ee..3dc138ed1ff8 100644 --- a/components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h +++ b/components/pmo/dispatcher/inc/wlan_pmo_wow_public_struct.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -258,22 +258,6 @@ struct pmo_wow_add_pattern { uint8_t session_id; }; -/** - * struct pmo_wow_add_pattern - wow pattern add structure - * @magic_pkt_enable: enables or disables magic packet filtering - * @wow_deauth_rcv: This configuration is valid only when magicPktEnable=1, - * It requests hardware to wake up when it receives the - * Deauthentication Frame. - * @pattern_filtering_enable: Enables/disables packet pattern filtering - * @wow_bss_conn_loss: wake up host when bss connection lost - */ -struct pmo_wow_enter_params { - uint8_t magic_pkt_enable; - uint8_t wow_deauth_rcv; - uint8_t pattern_filtering_enable; - uint8_t wow_bss_conn_loss; -}; - /** * struct pmo_wow_cmd_params - wow cmd parameter * @enable: wow enable or disable flag