drivers/staging/vt6656/iwctl.c: Remove unnecessary function

PATCH RESEND Superseded Marcos Paulo de Souza 2 participants 2 messages Nov 24, 2011 – Nov 27, 2011 Staging

lore

Share & tools

lore

Marcos Paulo de Souza

author

2011-11-24 21:11 UTC #0 lore raw

PATCH RESEND 1/1 drivers/staging/vt6656/iwctl.c: Remove unnecessary function

Removed the function iwctl_giwnwid, that was used once. Removed too a switch/case statement that was ambiguous.

Signed-off-by Marcos Paulo de Souza <[email protected]>

---
 drivers/staging/vt6656/iwctl.c    |   11 -----------
 drivers/staging/vt6656/iwctl.h    |    5 -----
 drivers/staging/vt6656/main_usb.c |    9 +--------
 3 files changed, 1 insertions(+), 24 deletions(-)

drivers/staging/vt6656/iwctl.c +0 ~~-11~~

index 8c1ca49..a9110bf 100644
@@ -127,17 +127,6 @@ int iwctl_giwname(struct net_device *dev,
 	return 0;
 }
 
-int iwctl_giwnwid(struct net_device *dev,
-             struct iw_request_info *info,
-			 struct iw_param *wrq,
-                   char *extra)
-{
- 	//wrq->value = 0x100;
-	//wrq->disabled = 0;
-	//wrq->fixed = 1;
-	//return 0;
-  return -EOPNOTSUPP;
-}
 /*
  * Wireless Handler : set scan
  */

drivers/staging/vt6656/iwctl.h +0 -5

index cc48954..10a240e 100644
@@ -77,11 +77,6 @@ int iwctl_giwname(struct net_device *dev,
 			 char *wrq,
 			 char *extra);
 
-int iwctl_giwnwid(struct net_device *dev,
-             struct iw_request_info *info,
-			 struct iw_param *wrq,
-                   char *extra) ;
-
 int iwctl_giwsens(struct net_device *dev,
 			 struct iw_request_info *info,
 			 struct iw_param *wrq,

drivers/staging/vt6656/main_usb.c +1 -8

index 27521b6..6f9930a 100644
@@ -1618,15 +1618,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 		break;
 
 	case SIOCSIWNWID:
-        rc = -EOPNOTSUPP;
-		break;
-
 	case SIOCGIWNWID:     //0x8b03  support
-	#ifdef  WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
-          rc = iwctl_giwnwid(dev, NULL, &(wrq->u.nwid), NULL);
-	#else
-        rc = -EOPNOTSUPP;
-	#endif
+		rc = -EOPNOTSUPP;
 		break;
 
 		// Set frequency/channel

Signature · 1 line

1.7.4.4

Greg KH

2011-11-27 09:51 UTC #1 lore raw

Quoted 2 lines · Marcos Paulo de Souza

Removed the function iwctl_giwnwid, that was used once. Removed too a switch/case statement that was ambiguous.

You've sent a bunch of vt66* patches recently, could you handle all of the review comments that I've made, and resend all of them, so I can properly apply them, as I don't know which ones depend on which.

thanks,

greg k-h