hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/net/wireless/intel/iwlegacy/common.h
....@@ -1,22 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
12 /******************************************************************************
23 *
34 * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
12
- * more details.
13
- *
14
- * You should have received a copy of the GNU General Public License along with
15
- * this program; if not, write to the Free Software Foundation, Inc.,
16
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
17
- *
18
- * The full GNU General Public License is included in this distribution in the
19
- * file called LICENSE.
205 *
216 * Contact Information:
227 * Intel Linux Wireless <ilw@linux.intel.com>
....@@ -793,9 +778,6 @@
793778 u16 barker_corr_th_min_mrc;
794779 u16 nrg_th_cca;
795780 };
796
-
797
-#define KELVIN_TO_CELSIUS(x) ((x)-273)
798
-#define CELSIUS_TO_KELVIN(x) ((x)+273)
799781
800782 /**
801783 * struct il_hw_params
....@@ -2030,13 +2012,6 @@
20302012 _il_release_nic_access(struct il_priv *il)
20312013 {
20322014 _il_clear_bit(il, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
2033
- /*
2034
- * In above we are reading CSR_GP_CNTRL register, what will flush any
2035
- * previous writes, but still want write, which clear MAC_ACCESS_REQ
2036
- * bit, be performed on PCI bus before any other writes scheduled on
2037
- * different CPUs (after we drop reg_lock).
2038
- */
2039
- mmiowb();
20402015 }
20412016
20422017 static inline u32
....@@ -2829,10 +2804,6 @@
28292804 struct il_traffic_load load[TID_MAX_LOAD_COUNT];
28302805 u8 tx_agg_tid_en;
28312806 #ifdef CONFIG_MAC80211_DEBUGFS
2832
- struct dentry *rs_sta_dbgfs_scale_table_file;
2833
- struct dentry *rs_sta_dbgfs_stats_table_file;
2834
- struct dentry *rs_sta_dbgfs_rate_scale_data_file;
2835
- struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
28362807 u32 dbg_fixed_rate;
28372808 #endif
28382809 struct il_priv *drv;
....@@ -2954,8 +2925,8 @@
29542925 #define IL_DBG(level, fmt, args...) \
29552926 do { \
29562927 if (il_get_debug_level(il) & level) \
2957
- dev_err(&il->hw->wiphy->dev, "%c %s " fmt, \
2958
- in_interrupt() ? 'I' : 'U', __func__ , ##args); \
2928
+ dev_err(&il->hw->wiphy->dev, "%s " fmt, __func__, \
2929
+ ##args); \
29592930 } while (0)
29602931
29612932 #define il_print_hex_dump(il, level, p, len) \
....@@ -2974,13 +2945,11 @@
29742945 #endif /* CONFIG_IWLEGACY_DEBUG */
29752946
29762947 #ifdef CONFIG_IWLEGACY_DEBUGFS
2977
-int il_dbgfs_register(struct il_priv *il, const char *name);
2948
+void il_dbgfs_register(struct il_priv *il, const char *name);
29782949 void il_dbgfs_unregister(struct il_priv *il);
29792950 #else
2980
-static inline int
2981
-il_dbgfs_register(struct il_priv *il, const char *name)
2951
+static inline void il_dbgfs_register(struct il_priv *il, const char *name)
29822952 {
2983
- return 0;
29842953 }
29852954
29862955 static inline void