diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-02-20 10:25:16 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 12:57:09 +0000 |
| commit | cf13771ddba2df5eab088a89d91b213330df183c (patch) | |
| tree | 6e33822e696f69274cf07b05fab4ea42c8e3b006 | |
| parent | e8c3c412e29547795b8584bc322bf8dfe9b977d8 (diff) | |
| download | backport-iwlwifi-cf13771ddba2df5eab088a89d91b213330df183c.tar.gz | |
[NOUPSTREAM] wifi: iwlwifi: rename/constify current_dbg_config
This really just holds the default configuration, and we then
load the file contents directly into the transport dbg_cfg,
so it's just "default_dbg_config" and can be const.
type=cleanup
ticket=none
Change-Id: Ic54a089638518101c918869b838824379e72bfd8
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/95316
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
x-iwlwifi-stack-dev: 21de47157dbdd5de1f83f2e9f2ec31d2b487130d
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 2 | ||||
| -rw-r--r-- | versions | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c index 940cd01676..d4e509640b 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2013-2015 Intel Mobile Communications GmbH - * Copyright (C) 2013-2015, 2019-2020, 2022-2023 Intel Corporation + * Copyright (C) 2013-2015, 2019-2020, 2022-2024 Intel Corporation * Copyright (C) 2016 Intel Deutschland GmbH */ #include <linux/types.h> @@ -21,7 +21,7 @@ #include "mvm/constants.h" #endif -struct iwl_dbg_cfg current_dbg_config = { +const struct iwl_dbg_cfg default_dbg_config = { #define DBG_CFG_REINCLUDE #define IWL_DBG_CFG(type, name) \ .name = IWL_ ## name, diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h index 16c8ff307b..af8b6c67df 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2013-2015, 2018-2023 Intel Corporation + * Copyright (C) 2013-2015, 2018-2024 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH */ #if !defined(__IWL_DBG_CFG_H__) || defined(DBG_CFG_REINCLUDE) @@ -316,7 +316,7 @@ struct iwl_dbg_cfg { #ifndef DBG_CFG_REINCLUDE }; -extern struct iwl_dbg_cfg current_dbg_config; +extern const struct iwl_dbg_cfg default_dbg_config; void iwl_dbg_cfg_free(struct iwl_dbg_cfg *dbgcfg); void iwl_dbg_cfg_load_ini(struct device *dev, struct iwl_dbg_cfg *dbgcfg); #endif /* DBG_CFG_REINCLUDE */ diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c index 09dc1369b8..3551c54e29 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c @@ -2107,7 +2107,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) INIT_LIST_HEAD(&drv->list); #ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES - trans->dbg_cfg = current_dbg_config; + trans->dbg_cfg = default_dbg_config; iwl_dbg_cfg_load_ini(drv->trans->dev, &drv->trans->dbg_cfg); #endif @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11936:068b6c64" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11937:21de4715" |