Commit 453a2a82 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove unused macros 



Various macros in mac80211 aren't used, remove them. In one
case it's used under ifdef, so ifdef it for the W=2 warning.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220202104617.5172d7fd878e.I2f1fce686a2b71003f083b2566fb09cf16b8165a@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 1b198233

net/mac80211/airtime.c

+0 −6
Original line number Diff line number Diff line
@@ -68,17 +68,11 @@ 
#define IEEE80211_VHT_STREAM_GROUPS	8 /* BW(=4) * SGI(=2) */



#define IEEE80211_HE_MAX_STREAMS	8

#define IEEE80211_HE_STREAM_GROUPS	12 /* BW(=4) * GI(=3) */



#define IEEE80211_HT_GROUPS_NB	(IEEE80211_MAX_STREAMS *	\

				 IEEE80211_HT_STREAM_GROUPS)

#define IEEE80211_VHT_GROUPS_NB	(IEEE80211_MAX_STREAMS *	\

					 IEEE80211_VHT_STREAM_GROUPS)

#define IEEE80211_HE_GROUPS_NB	(IEEE80211_HE_MAX_STREAMS *	\

				 IEEE80211_HE_STREAM_GROUPS)

#define IEEE80211_GROUPS_NB	(IEEE80211_HT_GROUPS_NB +	\

				 IEEE80211_VHT_GROUPS_NB +	\

				 IEEE80211_HE_GROUPS_NB)



#define IEEE80211_HT_GROUP_0	0

#define IEEE80211_VHT_GROUP_0	(IEEE80211_HT_GROUP_0 + IEEE80211_HT_GROUPS_NB)

net/mac80211/debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -634,8 +634,10 @@ static const struct file_operations stats_ ##name## _ops = { \ 
	.llseek = generic_file_llseek,					\

};



#ifdef CONFIG_MAC80211_DEBUG_COUNTERS

#define DEBUGFS_STATS_ADD(name)					\

	debugfs_create_u32(#name, 0400, statsd, &local->name);

#endif

#define DEBUGFS_DEVSTATS_ADD(name)					\

	debugfs_create_file(#name, 0400, statsd, local, &stats_ ##name## _ops);

net/mac80211/debugfs_key.c

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Copyright (c) 2006	Jiri Benc <jbenc@suse.cz>

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright (C) 2015	Intel Deutschland GmbH

 * Copyright (C) 2021   Intel Corporation

 */



#include <linux/kobject.h>
@@ -22,7 +23,6 @@ static ssize_t key_##name##_read(struct file *file, \ 
	return mac80211_format_buffer(userbuf, count, ppos, 		\

				      format_string, key->prop);	\

}

#define KEY_READ_D(name) KEY_READ(name, name, "%d\n")

#define KEY_READ_X(name) KEY_READ(name, name, "0x%x\n")



#define KEY_OPS(name)							\

net/mac80211/debugfs_netdev.c

+1 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Copyright (c) 2006	Jiri Benc <jbenc@suse.cz>

 * Copyright 2007	Johannes Berg <johannes@sipsolutions.net>

 * Copyright (C) 2020 Intel Corporation

 * Copyright (C) 2020-2021 Intel Corporation

 */



#include <linux/kernel.h>
@@ -77,8 +77,6 @@ static ssize_t ieee80211_if_fmt_##name( \ 
		IEEE80211_IF_FMT(name, field, "%#x\n")

#define IEEE80211_IF_FMT_LHEX(name, field)				\

		IEEE80211_IF_FMT(name, field, "%#lx\n")

#define IEEE80211_IF_FMT_SIZE(name, field)				\

		IEEE80211_IF_FMT(name, field, "%zd\n")



#define IEEE80211_IF_FMT_HEXARRAY(name, field)				\

static ssize_t ieee80211_if_fmt_##name(					\

net/mac80211/rc80211_minstrel_ht.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2010-2013 Felix Fietkau <nbd@openwrt.org>

 * Copyright (C) 2019-2020 Intel Corporation

 * Copyright (C) 2019-2021 Intel Corporation

 */

#include <linux/netdevice.h>

#include <linux/types.h>