Skip to contentSkip to conversation

wifi-rt2x00-use-explicitly-signed-or-unsigned-types.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Dec 1, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: wifi: rt2x00: use explicitly signed or unsigned types
has been removed from the -mm tree. Its filename was
wifi-rt2x00-use-explicitly-signed-or-unsigned-types.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Jason A. Donenfeld" <[email protected]>
Subject: wifi: rt2x00: use explicitly signed or unsigned types
Date: Wed, 19 Oct 2022 09:55:41 -0600

On some platforms, char is unsigned, but this driver, for the most part, assumed it was signed. In other places, it uses char to mean an unsigned number, but only in cases when the values are small. And in still other places, char is used as a boolean. Put an end to this confusion by declaring explicit types, depending on the context.

---

 drivers/net/wireless/ralink/rt2x00/rt2400pci.c |    8 +-
 drivers/net/wireless/ralink/rt2x00/rt2400pci.h |    2 
 drivers/net/wireless/ralink/rt2x00/rt2500pci.c |    8 +-
 drivers/net/wireless/ralink/rt2x00/rt2500pci.h |    2 
 drivers/net/wireless/ralink/rt2x00/rt2500usb.c |    8 +-
 drivers/net/wireless/ralink/rt2x00/rt2500usb.h |    2 
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c |   60 +++++++--------
 drivers/net/wireless/ralink/rt2x00/rt2800lib.h |    8 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00usb.c |    6 -
 drivers/net/wireless/ralink/rt2x00/rt61pci.c   |    4 -
 drivers/net/wireless/ralink/rt2x00/rt61pci.h   |    2 
 drivers/net/wireless/ralink/rt2x00/rt73usb.c   |    4 -
 drivers/net/wireless/ralink/rt2x00/rt73usb.h   |    2 
 13 files changed, 58 insertions(+), 58 deletions(-)
drivers/net/wireless/ralink/rt2x00/rt2400pci.c renamed from drivers/net/wireless/ralink/rt2x00/rt2400pci.c~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +4 -4
@@ -1023,9 +1023,9 @@ static int rt2400pci_set_state(struct rt
 {
 	u32 reg, reg2;
 	unsigned int i;
-	char put_to_sleep;
-	char bbp_state;
-	char rf_state;
+	bool put_to_sleep;
+	u8 bbp_state;
+	u8 rf_state;
 
 	put_to_sleep = (state != STATE_AWAKE);
 
@@ -1561,7 +1561,7 @@ static int rt2400pci_probe_hw_mode(struc
 {
 	struct hw_mode_spec *spec = &rt2x00dev->spec;
 	struct channel_info *info;
-	char *tx_power;
+	u8 *tx_power;
 	unsigned int i;
 
 	/*
drivers/net/wireless/ralink/rt2x00/rt2400pci.h renamed from drivers/net/wireless/ralink/rt2x00/rt2400pci.h~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +1 -1
@@ -939,7 +939,7 @@
 #define DEFAULT_TXPOWER	39
 
 #define __CLAMP_TX(__txpower) \
-	clamp_t(char, (__txpower), MIN_TXPOWER, MAX_TXPOWER)
+	clamp_t(u8, (__txpower), MIN_TXPOWER, MAX_TXPOWER)
 
 #define TXPOWER_FROM_DEV(__txpower) \
 	((__CLAMP_TX(__txpower) - MAX_TXPOWER) + MIN_TXPOWER)
drivers/net/wireless/ralink/rt2x00/rt2500pci.c renamed from drivers/net/wireless/ralink/rt2x00/rt2500pci.c~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +4 -4
@@ -1176,9 +1176,9 @@ static int rt2500pci_set_state(struct rt
 {
 	u32 reg, reg2;
 	unsigned int i;
-	char put_to_sleep;
-	char bbp_state;
-	char rf_state;
+	bool put_to_sleep;
+	u8 bbp_state;
+	u8 rf_state;
 
 	put_to_sleep = (state != STATE_AWAKE);
 
@@ -1856,7 +1856,7 @@ static int rt2500pci_probe_hw_mode(struc
 {
 	struct hw_mode_spec *spec = &rt2x00dev->spec;
 	struct channel_info *info;
-	char *tx_power;
+	u8 *tx_power;
 	unsigned int i;
 
 	/*
drivers/net/wireless/ralink/rt2x00/rt2500pci.h renamed from drivers/net/wireless/ralink/rt2x00/rt2500pci.h~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +1 -1
@@ -1219,6 +1219,6 @@
 	(((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
 
 #define TXPOWER_TO_DEV(__txpower) \
-	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)
+	clamp_t(u8, __txpower, MIN_TXPOWER, MAX_TXPOWER)
 
 #endif /* RT2500PCI_H */
drivers/net/wireless/ralink/rt2x00/rt2500usb.c renamed from drivers/net/wireless/ralink/rt2x00/rt2500usb.c~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +4 -4
@@ -984,9 +984,9 @@ static int rt2500usb_set_state(struct rt
 	u16 reg;
 	u16 reg2;
 	unsigned int i;
-	char put_to_sleep;
-	char bbp_state;
-	char rf_state;
+	bool put_to_sleep;
+	u8 bbp_state;
+	u8 rf_state;
 
 	put_to_sleep = (state != STATE_AWAKE);
 
@@ -1663,7 +1663,7 @@ static int rt2500usb_probe_hw_mode(struc
 {
 	struct hw_mode_spec *spec = &rt2x00dev->spec;
 	struct channel_info *info;
-	char *tx_power;
+	u8 *tx_power;
 	unsigned int i;
 
 	/*
drivers/net/wireless/ralink/rt2x00/rt2500usb.h renamed from drivers/net/wireless/ralink/rt2x00/rt2500usb.h~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +1 -1
@@ -839,6 +839,6 @@
 	(((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
 
 #define TXPOWER_TO_DEV(__txpower) \
-	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)
+	clamp_t(u8, __txpower, MIN_TXPOWER, MAX_TXPOWER)
 
 #endif /* RT2500USB_H */
drivers/net/wireless/ralink/rt2x00/rt2800lib.c renamed from drivers/net/wireless/ralink/rt2x00/rt2800lib.c~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +30 -30

177 lines not on this page · raw message

drivers/net/wireless/ralink/rt2x00/rt2800lib.h renamed from drivers/net/wireless/ralink/rt2x00/rt2800lib.h~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +4 -4
@@ -32,10 +32,10 @@ struct rf_reg_pair {
 struct rt2800_drv_data {
 	u8 calibration_bw20;
 	u8 calibration_bw40;
-	char rx_calibration_bw20;
-	char rx_calibration_bw40;
-	char tx_calibration_bw20;
-	char tx_calibration_bw40;
+	s8 rx_calibration_bw20;
+	s8 rx_calibration_bw40;
+	s8 tx_calibration_bw20;
+	s8 tx_calibration_bw40;
 	u8 bbp25;
 	u8 bbp26;
 	u8 txmixer_gain_24g;
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c renamed from drivers/net/wireless/ralink/rt2x00/rt2x00usb.c~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +3 -3
@@ -117,12 +117,12 @@ int rt2x00usb_vendor_request_buff(struct
 				  const u16 buffer_length)
 {
 	int status = 0;
-	unsigned char *tb;
+	u8 *tb;
 	u16 off, len, bsize;
 
 	mutex_lock(&rt2x00dev->csr_mutex);
 
-	tb  = (char *)buffer;
+	tb  = (u8 *)buffer;
 	off = offset;
 	len = buffer_length;
 	while (len && !status) {
@@ -215,7 +215,7 @@ void rt2x00usb_register_read_async(struc
 	rd->cr.wLength = cpu_to_le16(sizeof(u32));
 
 	usb_fill_control_urb(urb, usb_dev, usb_rcvctrlpipe(usb_dev, 0),
-			     (unsigned char *)(&rd->cr), &rd->reg, sizeof(rd->reg),
+			     (u8 *)(&rd->cr), &rd->reg, sizeof(rd->reg),
 			     rt2x00usb_register_read_async_cb, rd);
 	usb_anchor_urb(urb, rt2x00dev->anchor);
 	if (usb_submit_urb(urb, GFP_ATOMIC) < 0) {
drivers/net/wireless/ralink/rt2x00/rt61pci.c renamed from drivers/net/wireless/ralink/rt2x00/rt61pci.c~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +2 -2
@@ -1709,7 +1709,7 @@ static int rt61pci_set_state(struct rt2x
 {
 	u32 reg, reg2;
 	unsigned int i;
-	char put_to_sleep;
+	bool put_to_sleep;
 
 	put_to_sleep = (state != STATE_AWAKE);
 
@@ -2656,7 +2656,7 @@ static int rt61pci_probe_hw_mode(struct
 {
 	struct hw_mode_spec *spec = &rt2x00dev->spec;
 	struct channel_info *info;
-	char *tx_power;
+	u8 *tx_power;
 	unsigned int i;
 
 	/*
drivers/net/wireless/ralink/rt2x00/rt61pci.h renamed from drivers/net/wireless/ralink/rt2x00/rt61pci.h~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +1 -1
@@ -1484,6 +1484,6 @@ struct hw_pairwise_ta_entry {
 	(((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
 
 #define TXPOWER_TO_DEV(__txpower) \
-	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)
+	clamp_t(u8, __txpower, MIN_TXPOWER, MAX_TXPOWER)
 
 #endif /* RT61PCI_H */
drivers/net/wireless/ralink/rt2x00/rt73usb.c renamed from drivers/net/wireless/ralink/rt2x00/rt73usb.c~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +2 -2
@@ -1378,7 +1378,7 @@ static int rt73usb_set_state(struct rt2x
 {
 	u32 reg, reg2;
 	unsigned int i;
-	char put_to_sleep;
+	bool put_to_sleep;
 
 	put_to_sleep = (state != STATE_AWAKE);
 
@@ -2090,7 +2090,7 @@ static int rt73usb_probe_hw_mode(struct
 {
 	struct hw_mode_spec *spec = &rt2x00dev->spec;
 	struct channel_info *info;
-	char *tx_power;
+	u8 *tx_power;
 	unsigned int i;
 
 	/*
drivers/net/wireless/ralink/rt2x00/rt73usb.h renamed from drivers/net/wireless/ralink/rt2x00/rt73usb.h~wifi-rt2x00-use-explicitly-signed-or-unsigned-types +1 -1
@@ -1063,6 +1063,6 @@ struct hw_pairwise_ta_entry {
 	(((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
 
 #define TXPOWER_TO_DEV(__txpower) \
-	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)
+	clamp_t(u8, __txpower, MIN_TXPOWER, MAX_TXPOWER)
 
 #endif /* RT73USB_H */

_

Patches currently in -mm which might be from [email protected] are