移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/wireless/intel/iwlegacy/common.h
..
..
@@ -1,22 +1,7 @@
1
+/* SPDX-License-Identifier: GPL-2.0-only */
1
2
 /******************************************************************************
2
3
  *
3
4
  * 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.
20
5
  *
21
6
  * Contact Information:
22
7
  *  Intel Linux Wireless <ilw@linux.intel.com>
..
..
@@ -793,9 +778,6 @@
793
778
 	u16 barker_corr_th_min_mrc;
794
779
 	u16 nrg_th_cca;
795
780
 };
796
-
797
-#define KELVIN_TO_CELSIUS(x) ((x)-273)
798
-#define CELSIUS_TO_KELVIN(x) ((x)+273)
799
781
 
800
782
 /**
801
783
  * struct il_hw_params
..
..
@@ -2030,13 +2012,6 @@
2030
2012
 _il_release_nic_access(struct il_priv *il)
2031
2013
 {
2032
2014
 	_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();
2040
2015
 }
2041
2016
 
2042
2017
 static inline u32
..
..
@@ -2829,10 +2804,6 @@
2829
2804
 	struct il_traffic_load load[TID_MAX_LOAD_COUNT];
2830
2805
 	u8 tx_agg_tid_en;
2831
2806
 #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;
2836
2807
 	u32 dbg_fixed_rate;
2837
2808
 #endif
2838
2809
 	struct il_priv *drv;
..
..
@@ -2954,8 +2925,8 @@
2954
2925
 #define IL_DBG(level, fmt, args...)					\
2955
2926
 do {									\
2956
2927
 	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);					\
2959
2930
 } while (0)
2960
2931
 
2961
2932
 #define il_print_hex_dump(il, level, p, len)				\
..
..
@@ -2974,13 +2945,11 @@
2974
2945
 #endif /* CONFIG_IWLEGACY_DEBUG */
2975
2946
 
2976
2947
 #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);
2978
2949
 void il_dbgfs_unregister(struct il_priv *il);
2979
2950
 #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)
2982
2952
 {
2983
-	return 0;
2984
2953
 }
2985
2954
 
2986
2955
 static inline void