staging: rtl8188eu: Remove an unused variable and some lines of code

PATCH In review Fabio M. De Francesco 3 participants 4 messages Jul 5, 2021 – Jul 21, 2021 Staging

Share & tools

Fabio M. De Francesco

author

2021-07-05 13:41 UTC #0 lore raw

PATCH v2 1/1 staging: rtl8188eu: Remove an unused variable and some lines of code

Remove set but unused iw_operation_mode[]. This driver doesn't support SIOCSIWRATE. It just returns zero and does nothing. Change it to return -ENOTSUPP instead. (This is an API change but we don't expect it to break anything).

Signed-off-by Fabio M. De Francesco <[email protected]>

---

v1->v2: Delete rtw_wx_set_rate() and its association with command SIOCSIWRATE as suggested by Dan Carpenter <[email protected]>

 .../staging/rtl8188eu/os_dep/ioctl_linux.c    | 80 -------------------
 1 file changed, 80 deletions(-)

drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +0 ~~-80~~

index b958a8d882b0..eef8ed71cdef 100644
@@ -46,11 +46,6 @@ static u32 rtw_rates[] = {1000000, 2000000, 5500000, 11000000,
 	6000000, 9000000, 12000000, 18000000, 24000000, 36000000,
 	48000000, 54000000};
 
-static const char * const iw_operation_mode[] = {
-	"Auto", "Ad-Hoc", "Managed",  "Master", "Repeater",
-	"Secondary", "Monitor"
-};
-
 void indicate_wx_scan_complete_event(struct adapter *padapter)
 {
 	union iwreq_data wrqu;

@@ -1262,80 +1257,6 @@ static int rtw_wx_get_essid(struct net_device *dev,
 	return 0;
 }
 
-static int rtw_wx_set_rate(struct net_device *dev,
-			   struct iw_request_info *a,
-			   union iwreq_data *wrqu, char *extra)
-{
-	int i;
-	u8 datarates[NumRates];
-	u32	target_rate = wrqu->bitrate.value;
-	u32	fixed = wrqu->bitrate.fixed;
-	u32	ratevalue = 0;
-	u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};
-
-	if (target_rate == -1) {
-		ratevalue = 11;
-		goto set_rate;
-	}
-	target_rate /= 100000;
-
-	switch (target_rate) {
-	case 10:
-		ratevalue = 0;
-		break;
-	case 20:
-		ratevalue = 1;
-		break;
-	case 55:
-		ratevalue = 2;
-		break;
-	case 60:
-		ratevalue = 3;
-		break;
-	case 90:
-		ratevalue = 4;
-		break;
-	case 110:
-		ratevalue = 5;
-		break;
-	case 120:
-		ratevalue = 6;
-		break;
-	case 180:
-		ratevalue = 7;
-		break;
-	case 240:
-		ratevalue = 8;
-		break;
-	case 360:
-		ratevalue = 9;
-		break;
-	case 480:
-		ratevalue = 10;
-		break;
-	case 540:
-		ratevalue = 11;
-		break;
-	default:
-		ratevalue = 11;
-		break;
-	}
-
-set_rate:
-
-	for (i = 0; i < NumRates; i++) {
-		if (ratevalue == mpdatarate[i]) {
-			datarates[i] = mpdatarate[i];
-			if (fixed == 0)
-				break;
-		} else {
-			datarates[i] = 0xff;
-		}
-	}
-
-	return 0;
-}
-
 static int rtw_wx_get_rate(struct net_device *dev,
 			   struct iw_request_info *info,
 			   union iwreq_data *wrqu, char *extra)

@@ -2715,7 +2636,6 @@ static iw_handler rtw_handlers[] = {
 	IW_HANDLER(SIOCSIWESSID, rtw_wx_set_essid),
 	IW_HANDLER(SIOCGIWESSID, rtw_wx_get_essid),
 	IW_HANDLER(SIOCGIWNICKN, rtw_wx_get_nick),
-	IW_HANDLER(SIOCSIWRATE, rtw_wx_set_rate),
 	IW_HANDLER(SIOCGIWRATE, rtw_wx_get_rate),
 	IW_HANDLER(SIOCSIWRTS, rtw_wx_set_rts),
 	IW_HANDLER(SIOCGIWRTS, rtw_wx_get_rts),

Signature · 1 line

2.32.0

Dan Carpenter

Reviewed-by on v2 1/1

2021-07-05 13:46 UTC #1 lore raw

Quoted 8 lines · Fabio M. De Francesco

Remove set but unused iw_operation_mode[]. This driver doesn't support SIOCSIWRATE. It just returns zero and does nothing. Change it to return -ENOTSUPP instead. (This is an API change but we don't expect it to break anything).
Suggested-by Dan Carpenter <[email protected]>
Signed-off-by Fabio M. De Francesco <[email protected]>
---

Thanks!

Reviewed-by Dan Carpenter <[email protected]>

regards,
dan carpenter

Greg Kroah-Hartman

maintainer

2021-07-21 08:19 UTC #2 lore raw

In reply to Fabio M. De Francesco

Quoted 11 lines · Fabio M. De Francesco

Remove set but unused iw_operation_mode[]. This driver doesn't support SIOCSIWRATE. It just returns zero and does nothing. Change it to return -ENOTSUPP instead. (This is an API change but we don't expect it to break anything).
Suggested-by Dan Carpenter <[email protected]>
Signed-off-by Fabio M. De Francesco <[email protected]>
---
v1->v2: Delete rtw_wx_set_rate() and its association with command SIOCSIWRATE as suggested by Dan Carpenter <[email protected]>

Does not apply to my tree :(

Fabio M. De Francesco

author

2021-07-21 11:34 UTC #3 lore raw

Quoted 6 lines · CEST Greg Kroah-Hartman

Quoted 5 lines · Fabio M. De Francesco
Remove set but unused iw_operation_mode[]. This driver doesn't support SIOCSIWRATE. It just returns zero and does nothing. Change it to return -ENOTSUPP instead. (This is an API change but we don't expect it to break anything).

Quoted 9 lines

Quoted 6 lines
Suggested-by Dan Carpenter <[email protected]>
Signed-off-by Fabio M. De Francesco <[email protected]>
---
v1->v2: Delete rtw_wx_set_rate() and its association with command SIOCSIWRATE as suggested by Dan Carpenter <[email protected]>
Does not apply to my tree :(

Hi Greg,

It cannot apply to your tree because, while it was waiting for acceptance, someone else did a large part of the removal of the code related to the unsupported SIOCSIWRATE and you applied this other patch.

However, the no more necessary iw_operation_mode[] is still in your tree. So I'm about to send a patch that only removes the above-mentioned array.

Thanks,

Fabio