]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: iwlwifi: kill iwl-eeprom-read
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 12 May 2024 12:25:02 +0000 (15:25 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 23 May 2024 08:53:04 +0000 (10:53 +0200)
This is used by dvm only, move to dvm.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240512152312.72f4bf256c8d.I7433bda9b0fc9eece5210db2cb90c2f03973f5ec@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/intel/iwlwifi/Makefile
drivers/net/wireless/intel/iwlwifi/dvm/Makefile
drivers/net/wireless/intel/iwlwifi/dvm/agn.h
drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c [moved from drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c with 98% similarity]
drivers/net/wireless/intel/iwlwifi/dvm/main.c
drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h [deleted file]
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c

index 8bb94a4c12cd5f7f6fd16438ba5fee0b5783b60d..2c2c18cef9ff9233ecd833bb2e8d4c1340788e83 100644 (file)
@@ -4,7 +4,7 @@ obj-$(CONFIG_IWLWIFI)   += iwlwifi.o
 iwlwifi-objs           += iwl-io.o
 iwlwifi-objs           += iwl-drv.o
 iwlwifi-objs           += iwl-debug.o
-iwlwifi-objs           += iwl-eeprom-read.o iwl-eeprom-parse.o
+iwlwifi-objs           += iwl-eeprom-parse.o
 iwlwifi-objs           += iwl-phy-db.o iwl-nvm-parse.o
 iwlwifi-objs           += pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
 iwlwifi-objs           += pcie/ctxt-info.o pcie/ctxt-info-gen3.o
index 0486b17d7c41f4f41ce15e5693a4846838156908..2d0b6d287af4168f4b566ed5620f1e22c987b383 100644 (file)
@@ -2,7 +2,7 @@
 # DVM
 obj-$(CONFIG_IWLDVM)   += iwldvm.o
 iwldvm-objs            += main.o rs.o mac80211.o ucode.o tx.o
-iwldvm-objs            += lib.o calib.o tt.o sta.o rx.o
+iwldvm-objs            += lib.o calib.o tt.o sta.o rx.o eeprom.o
 
 iwldvm-objs            += power.o
 iwldvm-objs            += scan.o
index fefaa414272b3a75ef0bffa1a36a7a4f2724b37f..47d21413ba596db600784a8efbb730274055e524 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright (C) 2005-2014, 2021 Intel Corporation
+ * Copyright (C) 2005-2014, 2021, 2024 Intel Corporation
  */
 #ifndef __iwl_agn_h__
 #define __iwl_agn_h__
@@ -385,6 +385,8 @@ static inline void iwl_dvm_set_pmi(struct iwl_priv *priv, bool state)
        iwl_trans_set_pmi(priv->trans, state);
 }
 
+int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size);
+
 #ifdef CONFIG_IWLWIFI_DEBUGFS
 void iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir);
 #else
similarity index 98%
rename from drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c
rename to drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c
index 5f386bb1a353946d41d559d123c8382105c3e441..3972775fc133b31c965d3c105b688e76b363c619 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2005-2014, 2018-2019, 2021 Intel Corporation
+ * Copyright (C) 2005-2014, 2018-2019, 2021, 2024 Intel Corporation
  */
 #include <linux/types.h>
 #include <linux/slab.h>
@@ -8,10 +8,10 @@
 
 #include "iwl-drv.h"
 #include "iwl-debug.h"
-#include "iwl-eeprom-read.h"
 #include "iwl-io.h"
 #include "iwl-prph.h"
 #include "iwl-csr.h"
+#include "agn.h"
 
 /*
  * EEPROM access time values:
@@ -391,4 +391,3 @@ int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size)
 
        return ret;
 }
-IWL_EXPORT_SYMBOL(iwl_read_eeprom);
index 8774dd7b921effb43568d09a92c6f7ec47260d16..7bb3011e12e378581d7a76ce1a93845c6b616473 100644 (file)
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2014, 2018 - 2022  Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2014, 2018 - 2022 Intel Corporation. All rights reserved.
+ * Copyright(c) 2024 Intel Corporation. All rights reserved.
  * Copyright(c) 2015 Intel Deutschland GmbH
  *
  * Portions of this file are derived from the ipw3945 project, as well
@@ -25,7 +26,6 @@
 
 #include <asm/div64.h>
 
-#include "iwl-eeprom-read.h"
 #include "iwl-eeprom-parse.h"
 #include "iwl-io.h"
 #include "iwl-trans.h"
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h
deleted file mode 100644 (file)
index 63b8e6c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/*
- * Copyright (C) 2005-2014 Intel Corporation
- */
-#ifndef __iwl_eeprom_h__
-#define __iwl_eeprom_h__
-
-#include "iwl-trans.h"
-
-int iwl_read_eeprom(struct iwl_trans *trans, u8 **eeprom, size_t *eeprom_size);
-
-#endif  /* __iwl_eeprom_h__ */
index ae817722288134ee98bcaae0fee4c6c5bdd3c0f8..1e949b48188e389dac0ba75426f2eac485f2a2d4 100644 (file)
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright (C) 2012-2014, 2018-2019, 2021-2023 Intel Corporation
+ * Copyright (C) 2012-2014, 2018-2019, 2021-2024 Intel Corporation
  * Copyright (C) 2013-2015 Intel Mobile Communications GmbH
  * Copyright (C) 2016-2017 Intel Deutschland GmbH
  */
@@ -10,7 +10,6 @@
 #include "iwl-csr.h"
 #include "mvm.h"
 #include "iwl-eeprom-parse.h"
-#include "iwl-eeprom-read.h"
 #include "iwl-nvm-parse.h"
 #include "iwl-prph.h"
 #include "fw/acpi.h"