Commit 27e99d03 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Replace macro iwe_stream_add_event_rsl with standard function 



Replace macro iwe_stream_add_event_rsl with standard function
iwe_stream_add_event to increase readability.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/00a8057acc994c139530a070974694b999a8f96a.1679504314.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 861a6a82

drivers/staging/rtl8192e/rtllib.h

+0 −3
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ 
#define container_of_dwork_rsl(x, y, z)				\

	container_of(to_delayed_work(x), y, z)



#define iwe_stream_add_event_rsl(info, start, stop, iwe, len)	\

	iwe_stream_add_event(info, start, stop, iwe, len)



#define iwe_stream_add_point_rsl(info, start, stop, iwe, p)	\

	iwe_stream_add_point(info, start, stop, iwe, p)

drivers/staging/rtl8192e/rtllib_wx.c

+6 −10
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, 
	iwe.cmd = SIOCGIWAP;

	iwe.u.ap_addr.sa_family = ARPHRD_ETHER;

	ether_addr_copy(iwe.u.ap_addr.sa_data, network->bssid);

	start = iwe_stream_add_event_rsl(info, start, stop,

					 &iwe, IW_EV_ADDR_LEN);

	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_ADDR_LEN);

	/* Remaining entries will be displayed in the order we provide them */



	/* Add the ESSID */
@@ -71,8 +70,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, 
	}

	*pname = '\0';

	snprintf(iwe.u.name, IFNAMSIZ, "IEEE802.11%s", proto_name);

	start = iwe_stream_add_event_rsl(info, start, stop,

					 &iwe, IW_EV_CHAR_LEN);

	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);

	/* Add mode */

	iwe.cmd = SIOCGIWMODE;

	if (network->capability &
@@ -81,8 +79,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, 
			iwe.u.mode = IW_MODE_MASTER;

		else

			iwe.u.mode = IW_MODE_ADHOC;

		start = iwe_stream_add_event_rsl(info, start, stop,

						 &iwe, IW_EV_UINT_LEN);

		start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_UINT_LEN);

	}



	/* Add frequency/channel */
@@ -90,8 +87,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, 
	iwe.u.freq.m = network->channel;

	iwe.u.freq.e = 0;

	iwe.u.freq.i = 0;

	start = iwe_stream_add_event_rsl(info, start, stop, &iwe,

					 IW_EV_FREQ_LEN);

	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_FREQ_LEN);



	/* Add encryption capability */

	iwe.cmd = SIOCGIWENCODE;
@@ -152,7 +148,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, 
	iwe.u.bitrate.disabled = 0;

	iwe.u.bitrate.fixed = 0;

	iwe.u.bitrate.value = max_rate * 500000;

	start = iwe_stream_add_event_rsl(info, start, stop, &iwe, IW_EV_PARAM_LEN);

	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN);

	iwe.cmd = IWEVCUSTOM;

	iwe.u.data.length = p - custom;

	if (iwe.u.data.length)
@@ -172,7 +168,7 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee, 
	if (!(network->stats.mask & RTLLIB_STATMASK_SIGNAL))

		iwe.u.qual.updated |= IW_QUAL_QUAL_INVALID;

	iwe.u.qual.updated = 7;

	start = iwe_stream_add_event_rsl(info, start, stop, &iwe, IW_EV_QUAL_LEN);

	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_QUAL_LEN);



	iwe.cmd = IWEVCUSTOM;

	p = custom;