Skip to content

Commit d04bb08

Browse files
zx2c4akpm00
zx2c4
authored and
akpm00
committed
wifi: rt2x00: use explicitly signed or unsigned types
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. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Jason A. Donenfeld <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent d472cf7 commit d04bb08

File tree

13 files changed

+58
-58
lines changed

13 files changed

+58
-58
lines changed

‎drivers/net/wireless/ralink/rt2x00/rt2400pci.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,9 +1023,9 @@ static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev,
10231023
{
10241024
u32 reg, reg2;
10251025
unsigned int i;
1026-
char put_to_sleep;
1027-
char bbp_state;
1028-
char rf_state;
1026+
bool put_to_sleep;
1027+
u8 bbp_state;
1028+
u8 rf_state;
10291029

10301030
put_to_sleep = (state != STATE_AWAKE);
10311031

@@ -1561,7 +1561,7 @@ static int rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
15611561
{
15621562
struct hw_mode_spec *spec = &rt2x00dev->spec;
15631563
struct channel_info *info;
1564-
char *tx_power;
1564+
u8 *tx_power;
15651565
unsigned int i;
15661566

15671567
/*

‎drivers/net/wireless/ralink/rt2x00/rt2400pci.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@
939939
#define DEFAULT_TXPOWER 39
940940

941941
#define __CLAMP_TX(__txpower) \
942-
clamp_t(char, (__txpower), MIN_TXPOWER, MAX_TXPOWER)
942+
clamp_t(u8, (__txpower), MIN_TXPOWER, MAX_TXPOWER)
943943

944944
#define TXPOWER_FROM_DEV(__txpower) \
945945
((__CLAMP_TX(__txpower) - MAX_TXPOWER) + MIN_TXPOWER)

‎drivers/net/wireless/ralink/rt2x00/rt2500pci.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,9 +1176,9 @@ static int rt2500pci_set_state(struct rt2x00_dev *rt2x00dev,
11761176
{
11771177
u32 reg, reg2;
11781178
unsigned int i;
1179-
char put_to_sleep;
1180-
char bbp_state;
1181-
char rf_state;
1179+
bool put_to_sleep;
1180+
u8 bbp_state;
1181+
u8 rf_state;
11821182

11831183
put_to_sleep = (state != STATE_AWAKE);
11841184

@@ -1856,7 +1856,7 @@ static int rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
18561856
{
18571857
struct hw_mode_spec *spec = &rt2x00dev->spec;
18581858
struct channel_info *info;
1859-
char *tx_power;
1859+
u8 *tx_power;
18601860
unsigned int i;
18611861

18621862
/*

‎drivers/net/wireless/ralink/rt2x00/rt2500pci.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,6 +1219,6 @@
12191219
(((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
12201220

12211221
#define TXPOWER_TO_DEV(__txpower) \
1222-
clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)
1222+
clamp_t(u8, __txpower, MIN_TXPOWER, MAX_TXPOWER)
12231223

12241224
#endif /* RT2500PCI_H */

‎drivers/net/wireless/ralink/rt2x00/rt2500usb.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -984,9 +984,9 @@ static int rt2500usb_set_state(struct rt2x00_dev *rt2x00dev,
984984
u16 reg;
985985
u16 reg2;
986986
unsigned int i;
987-
char put_to_sleep;
988-
char bbp_state;
989-
char rf_state;
987+
bool put_to_sleep;
988+
u8 bbp_state;
989+
u8 rf_state;
990990

991991
put_to_sleep = (state != STATE_AWAKE);
992992

@@ -1663,7 +1663,7 @@ static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
16631663
{
16641664
struct hw_mode_spec *spec = &rt2x00dev->spec;
16651665
struct channel_info *info;
1666-
char *tx_power;
1666+
u8 *tx_power;
16671667
unsigned int i;
16681668

16691669
/*

‎drivers/net/wireless/ralink/rt2x00/rt2500usb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,6 @@
839839
(((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)
840840

841841
#define TXPOWER_TO_DEV(__txpower) \
842-
clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)
842+
clamp_t(u8, __txpower, MIN_TXPOWER, MAX_TXPOWER)
843843

844844
#endif /* RT2500USB_H */

‎drivers/net/wireless/ralink/rt2x00/rt2800lib.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3372,10 +3372,10 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
33723372
if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
33733373
if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
33743374
/* r55/r59 value array of channel 1~14 */
3375-
static const char r55_bt_rev[] = {0x83, 0x83,
3375+
static const u8 r55_bt_rev[] = {0x83, 0x83,
33763376
0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
33773377
0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
3378-
static const char r59_bt_rev[] = {0x0e, 0x0e,
3378+
static const u8 r59_bt_rev[] = {0x0e, 0x0e,
33793379
0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
33803380
0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
33813381

@@ -3384,18 +3384,18 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
33843384
rt2800_rfcsr_write(rt2x00dev, 59,
33853385
r59_bt_rev[idx]);
33863386
} else {
3387-
static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
3387+
static const u8 r59_bt[] = {0x8b, 0x8b, 0x8b,
33883388
0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
33893389
0x88, 0x88, 0x86, 0x85, 0x84};
33903390

33913391
rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
33923392
}
33933393
} else {
33943394
if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
3395-
static const char r55_nonbt_rev[] = {0x23, 0x23,
3395+
static const u8 r55_nonbt_rev[] = {0x23, 0x23,
33963396
0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
33973397
0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
3398-
static const char r59_nonbt_rev[] = {0x07, 0x07,
3398+
static const u8 r59_nonbt_rev[] = {0x07, 0x07,
33993399
0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
34003400
0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
34013401

@@ -3406,14 +3406,14 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
34063406
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
34073407
rt2x00_rt(rt2x00dev, RT5392) ||
34083408
rt2x00_rt(rt2x00dev, RT6352)) {
3409-
static const char r59_non_bt[] = {0x8f, 0x8f,
3409+
static const u8 r59_non_bt[] = {0x8f, 0x8f,
34103410
0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
34113411
0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
34123412

34133413
rt2800_rfcsr_write(rt2x00dev, 59,
34143414
r59_non_bt[idx]);
34153415
} else if (rt2x00_rt(rt2x00dev, RT5350)) {
3416-
static const char r59_non_bt[] = {0x0b, 0x0b,
3416+
static const u8 r59_non_bt[] = {0x0b, 0x0b,
34173417
0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
34183418
0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
34193419

@@ -4035,23 +4035,23 @@ static void rt2800_iq_calibrate(struct rt2x00_dev *rt2x00dev, int channel)
40354035
rt2800_bbp_write(rt2x00dev, 159, cal != 0xff ? cal : 0);
40364036
}
40374037

4038-
static char rt2800_txpower_to_dev(struct rt2x00_dev *rt2x00dev,
4038+
static s8 rt2800_txpower_to_dev(struct rt2x00_dev *rt2x00dev,
40394039
unsigned int channel,
4040-
char txpower)
4040+
s8 txpower)
40414041
{
40424042
if (rt2x00_rt(rt2x00dev, RT3593) ||
40434043
rt2x00_rt(rt2x00dev, RT3883))
40444044
txpower = rt2x00_get_field8(txpower, EEPROM_TXPOWER_ALC);
40454045

40464046
if (channel <= 14)
4047-
return clamp_t(char, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);
4047+
return clamp_t(s8, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);
40484048

40494049
if (rt2x00_rt(rt2x00dev, RT3593) ||
40504050
rt2x00_rt(rt2x00dev, RT3883))
4051-
return clamp_t(char, txpower, MIN_A_TXPOWER_3593,
4051+
return clamp_t(s8, txpower, MIN_A_TXPOWER_3593,
40524052
MAX_A_TXPOWER_3593);
40534053
else
4054-
return clamp_t(char, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER);
4054+
return clamp_t(s8, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER);
40554055
}
40564056

40574057
static void rt3883_bbp_adjust(struct rt2x00_dev *rt2x00dev,
@@ -8530,7 +8530,7 @@ static void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev)
85308530
u8 bytevalue = 0;
85318531
int rcalcode;
85328532
u8 r_cal_code = 0;
8533-
char d1 = 0, d2 = 0;
8533+
s8 d1 = 0, d2 = 0;
85348534
u8 rfvalue;
85358535
u32 MAC_RF_BYPASS0, MAC_RF_CONTROL0, MAC_PWR_PIN_CFG;
85368536
u32 maccfg;
@@ -8591,7 +8591,7 @@ static void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev)
85918591
if (bytevalue > 128)
85928592
d1 = bytevalue - 256;
85938593
else
8594-
d1 = (char)bytevalue;
8594+
d1 = (s8)bytevalue;
85958595
rt2800_bbp_write(rt2x00dev, 22, 0x0);
85968596
rt2800_rfcsr_write_bank(rt2x00dev, 0, 35, 0x01);
85978597

@@ -8601,7 +8601,7 @@ static void rt2800_r_calibration(struct rt2x00_dev *rt2x00dev)
86018601
if (bytevalue > 128)
86028602
d2 = bytevalue - 256;
86038603
else
8604-
d2 = (char)bytevalue;
8604+
d2 = (s8)bytevalue;
86058605
rt2800_bbp_write(rt2x00dev, 22, 0x0);
86068606

86078607
rcalcode = rt2800_calcrcalibrationcode(rt2x00dev, d1, d2);
@@ -8703,7 +8703,7 @@ static void rt2800_rxdcoc_calibration(struct rt2x00_dev *rt2x00dev)
87038703
static u32 rt2800_do_sqrt_accumulation(u32 si)
87048704
{
87058705
u32 root, root_pre, bit;
8706-
char i;
8706+
s8 i;
87078707

87088708
bit = 1 << 15;
87098709
root = 0;
@@ -9330,11 +9330,11 @@ static void rt2800_loft_search(struct rt2x00_dev *rt2x00dev, u8 ch_idx,
93309330
u8 alc_idx, u8 dc_result[][RF_ALC_NUM][2])
93319331
{
93329332
u32 p0 = 0, p1 = 0, pf = 0;
9333-
char idx0 = 0, idx1 = 0;
9333+
s8 idx0 = 0, idx1 = 0;
93349334
u8 idxf[] = {0x00, 0x00};
93359335
u8 ibit = 0x20;
93369336
u8 iorq;
9337-
char bidx;
9337+
s8 bidx;
93389338

93399339
rt2800_bbp_write(rt2x00dev, 158, 0xb0);
93409340
rt2800_bbp_write(rt2x00dev, 159, 0x80);
@@ -9384,17 +9384,17 @@ static void rt2800_loft_search(struct rt2x00_dev *rt2x00dev, u8 ch_idx,
93849384
static void rt2800_iq_search(struct rt2x00_dev *rt2x00dev, u8 ch_idx, u8 *ges, u8 *pes)
93859385
{
93869386
u32 p0 = 0, p1 = 0, pf = 0;
9387-
char perr = 0, gerr = 0, iq_err = 0;
9388-
char pef = 0, gef = 0;
9389-
char psta, pend;
9390-
char gsta, gend;
9387+
s8 perr = 0, gerr = 0, iq_err = 0;
9388+
s8 pef = 0, gef = 0;
9389+
s8 psta, pend;
9390+
s8 gsta, gend;
93919391

93929392
u8 ibit = 0x20;
93939393
u8 first_search = 0x00, touch_neg_max = 0x00;
9394-
char idx0 = 0, idx1 = 0;
9394+
s8 idx0 = 0, idx1 = 0;
93959395
u8 gop;
93969396
u8 bbp = 0;
9397-
char bidx;
9397+
s8 bidx;
93989398

93999399
for (bidx = 5; bidx >= 1; bidx--) {
94009400
for (gop = 0; gop < 2; gop++) {
@@ -10043,11 +10043,11 @@ static int rt2800_rf_lp_config(struct rt2x00_dev *rt2x00dev, bool btxcal)
1004310043
return 0;
1004410044
}
1004510045

10046-
static char rt2800_lp_tx_filter_bw_cal(struct rt2x00_dev *rt2x00dev)
10046+
static s8 rt2800_lp_tx_filter_bw_cal(struct rt2x00_dev *rt2x00dev)
1004710047
{
1004810048
unsigned int cnt;
1004910049
u8 bbp_val;
10050-
char cal_val;
10050+
s8 cal_val;
1005110051

1005210052
rt2800_bbp_dcoc_write(rt2x00dev, 0, 0x82);
1005310053

@@ -10079,7 +10079,7 @@ static void rt2800_bw_filter_calibration(struct rt2x00_dev *rt2x00dev,
1007910079
u8 rx_filter_target_20m = 0x27, rx_filter_target_40m = 0x31;
1008010080
int loop = 0, is_ht40, cnt;
1008110081
u8 bbp_val, rf_val;
10082-
char cal_r32_init, cal_r32_val, cal_diff;
10082+
s8 cal_r32_init, cal_r32_val, cal_diff;
1008310083
u8 saverfb5r00, saverfb5r01, saverfb5r03, saverfb5r04, saverfb5r05;
1008410084
u8 saverfb5r06, saverfb5r07;
1008510085
u8 saverfb5r08, saverfb5r17, saverfb5r18, saverfb5r19, saverfb5r20;
@@ -11550,9 +11550,9 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
1155011550
{
1155111551
struct hw_mode_spec *spec = &rt2x00dev->spec;
1155211552
struct channel_info *info;
11553-
char *default_power1;
11554-
char *default_power2;
11555-
char *default_power3;
11553+
s8 *default_power1;
11554+
s8 *default_power2;
11555+
s8 *default_power3;
1155611556
unsigned int i, tx_chains, rx_chains;
1155711557
u32 reg;
1155811558

‎drivers/net/wireless/ralink/rt2x00/rt2800lib.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ struct rf_reg_pair {
3232
struct rt2800_drv_data {
3333
u8 calibration_bw20;
3434
u8 calibration_bw40;
35-
char rx_calibration_bw20;
36-
char rx_calibration_bw40;
37-
char tx_calibration_bw20;
38-
char tx_calibration_bw40;
35+
s8 rx_calibration_bw20;
36+
s8 rx_calibration_bw40;
37+
s8 tx_calibration_bw20;
38+
s8 tx_calibration_bw40;
3939
u8 bbp25;
4040
u8 bbp26;
4141
u8 txmixer_gain_24g;

‎drivers/net/wireless/ralink/rt2x00/rt2x00usb.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ int rt2x00usb_vendor_request_buff(struct rt2x00_dev *rt2x00dev,
117117
const u16 buffer_length)
118118
{
119119
int status = 0;
120-
unsigned char *tb;
120+
u8 *tb;
121121
u16 off, len, bsize;
122122

123123
mutex_lock(&rt2x00dev->csr_mutex);
124124

125-
tb = (char *)buffer;
125+
tb = (u8 *)buffer;
126126
off = offset;
127127
len = buffer_length;
128128
while (len && !status) {
@@ -215,7 +215,7 @@ void rt2x00usb_register_read_async(struct rt2x00_dev *rt2x00dev,
215215
rd->cr.wLength = cpu_to_le16(sizeof(u32));
216216

217217
usb_fill_control_urb(urb, usb_dev, usb_rcvctrlpipe(usb_dev, 0),
218-
(unsigned char *)(&rd->cr), &rd->reg, sizeof(rd->reg),
218+
(u8 *)(&rd->cr), &rd->reg, sizeof(rd->reg),
219219
rt2x00usb_register_read_async_cb, rd);
220220
usb_anchor_urb(urb, rt2x00dev->anchor);
221221
if (usb_submit_urb(urb, GFP_ATOMIC) < 0) {

‎drivers/net/wireless/ralink/rt2x00/rt61pci.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,7 @@ static int rt61pci_set_state(struct rt2x00_dev *rt2x00dev, enum dev_state state)
17091709
{
17101710
u32 reg, reg2;
17111711
unsigned int i;
1712-
char put_to_sleep;
1712+
bool put_to_sleep;
17131713

17141714
put_to_sleep = (state != STATE_AWAKE);
17151715

@@ -2656,7 +2656,7 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
26562656
{
26572657
struct hw_mode_spec *spec = &rt2x00dev->spec;
26582658
struct channel_info *info;
2659-
char *tx_power;
2659+
u8 *tx_power;
26602660
unsigned int i;
26612661

26622662
/*

0 commit comments

Comments
 (0)