From 6df18d4da851bcb71bf425c05b85842b5136d4dd Mon Sep 17 00:00:00 2001 From: Chaitanya Kiran Godavarthi Date: Fri, 1 Feb 2019 00:27:34 +0530 Subject: [PATCH] qcacmn: Remove service ready callback for smartlog enable Remove service ready callback for smartlog enable. Change-Id: I1d2807b0ec59b4f38bb8e2ac5365f3b57cf37437 --- target_if/core/inc/target_if.h | 22 ------------------- .../init_deinit/src/init_event_handler.c | 1 - utils/fwlog/fw_dbglog_api.c | 6 ++--- utils/fwlog/inc/fw_dbglog_api.h | 7 +++--- utils/fwlog/inc/fw_dbglog_priv.h | 4 ++-- 5 files changed, 8 insertions(+), 32 deletions(-) diff --git a/target_if/core/inc/target_if.h b/target_if/core/inc/target_if.h index 07d4d49402..cb1f40cabf 100644 --- a/target_if/core/inc/target_if.h +++ b/target_if/core/inc/target_if.h @@ -279,9 +279,6 @@ struct target_ops { struct wlan_objmgr_psoc *psoc, struct target_psoc_info *tgt_hdl, uint8_t *evt_buf); - void (*smart_log_enable) - (struct wlan_objmgr_psoc *psoc, - struct target_psoc_info *tgt_info, uint8_t *event); void (*eapol_minrate_enable) (struct wlan_objmgr_psoc *psoc, struct target_psoc_info *tgt_info, uint8_t *event); @@ -2118,24 +2115,5 @@ static inline int32_t target_psoc_get_num_hw_modes return tgt_hdl->info.service_ext_param.num_hw_modes; } - -/** - * target_if_smart_log enable() - Enable Smart Logs - * @psoc: psoc object - * @tgt_hdl: target_psoc_info pointer - * @evt_buf: Service ready Event buffer received from FW - * - * API to enable Smart Logs - * - * Return: none - */ -static inline void target_if_smart_log_enable - (struct wlan_objmgr_psoc *psoc, - struct target_psoc_info *tgt_hdl, - uint8_t *evt_buf) -{ - if ((tgt_hdl->tif_ops) && (tgt_hdl->tif_ops->smart_log_enable)) - tgt_hdl->tif_ops->smart_log_enable(psoc, tgt_hdl, evt_buf); -} #endif diff --git a/target_if/init_deinit/src/init_event_handler.c b/target_if/init_deinit/src/init_event_handler.c index 6b6280524d..c5ac2832dc 100644 --- a/target_if/init_deinit/src/init_event_handler.c +++ b/target_if/init_deinit/src/init_event_handler.c @@ -177,7 +177,6 @@ static int init_deinit_service_ready_event_handler(ol_scn_t scn_handle, target_if_debug("Wait for EXT message"); } - target_if_smart_log_enable(psoc, tgt_hdl, event); exit: return err_code; } diff --git a/utils/fwlog/fw_dbglog_api.c b/utils/fwlog/fw_dbglog_api.c index 387ef13406..2f22ad9fd7 100644 --- a/utils/fwlog/fw_dbglog_api.c +++ b/utils/fwlog/fw_dbglog_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2019 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 @@ -140,12 +140,12 @@ void fwdbg_set_report_size(struct common_dbglog_handle *dbg_handle, } -int fwdbg_smartlog_init(struct common_dbglog_handle *dbg_handle, void *soc) +int fwdbg_smartlog_init(struct common_dbglog_handle *dbg_handle, void *icp) { struct dbglog_info *dbg_info = handle2info(dbg_handle); if (dbg_info->ops->smartlog_init) - return dbg_info->ops->smartlog_init(soc); + return dbg_info->ops->smartlog_init(icp); return 0; } diff --git a/utils/fwlog/inc/fw_dbglog_api.h b/utils/fwlog/inc/fw_dbglog_api.h index 35f8e9531d..6499e14c44 100644 --- a/utils/fwlog/inc/fw_dbglog_api.h +++ b/utils/fwlog/inc/fw_dbglog_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2019 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 @@ -172,11 +172,11 @@ void fwdbg_set_report_size(struct common_dbglog_handle *dbg_handle, /** * fwdbg_smartlog_init() - initialize smart logging feature * @dbg_handle: Debug module handle - * @soc: soc handler + * @ic: ic handler * * Return: 0 Success */ -int fwdbg_smartlog_init(struct common_dbglog_handle *dbg_handle, void *soc); +int fwdbg_smartlog_init(struct common_dbglog_handle *dbg_handle, void *icp); /** * fwdbg_smartlog_deinit() - uninitializes smart logging feature @@ -199,5 +199,4 @@ void fwdbg_smartlog_deinit(struct common_dbglog_handle *dbg_handle, void *sc); ssize_t fwdbg_smartlog_dump(struct common_dbglog_handle *dbg_handle, struct device *dev, struct device_attribute *attr, char *buf); - #endif /* _FW_DBGLOG_API_H_ */ diff --git a/utils/fwlog/inc/fw_dbglog_priv.h b/utils/fwlog/inc/fw_dbglog_priv.h index e07b1d4608..e7c5abdaeb 100644 --- a/utils/fwlog/inc/fw_dbglog_priv.h +++ b/utils/fwlog/inc/fw_dbglog_priv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2019 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 @@ -41,7 +41,7 @@ void (*dbglog_module_log_enable)(ol_scn_t scn, void (*dbglog_init)(void *scn); void (*dbglog_set_report_size)(ol_scn_t scn, uint16_t size); void (*dbglog_free)(void *soc); -int (*smartlog_init)(void *sc); +int (*smartlog_init)(void *icp); void (*smartlog_deinit)(void *sc); ssize_t (*smartlog_dump)(struct device *dev, struct device_attribute *attr, char *buf);