Skip to contentSkip to conversation

staging: vt6656: iwctl.c: Remove return statement of iwctl_giwessid

PATCH New Marcos Paulo de Souza 1 participant 1 message Dec 28, 2011 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 5/7 staging: vt6656: iwctl.c: Remove return statement of iwctl_giwessid

This function will always return 0, and this data is not used by who calls this function.

---
 drivers/staging/vt6656/iwctl.c    |    5 +----
 drivers/staging/vt6656/iwctl.h    |    2 +-
 drivers/staging/vt6656/main_usb.c |    4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)
drivers/staging/vt6656/iwctl.c +1 -4
index a3b2f1e..e61e116 100644
@@ -856,8 +856,7 @@ int iwctl_siwessid(struct net_device *dev,
 /*
  * Wireless Handler : get essid
  */
-
-int iwctl_giwessid(struct net_device *dev,
+void iwctl_giwessid(struct net_device *dev,
              struct iw_request_info *info,
              struct iw_point *wrq,
              char *extra)
@@ -879,8 +878,6 @@ int iwctl_giwessid(struct net_device *dev,
 
         wrq->length = pItemSSID->len;
 	wrq->flags = 1; // active
-
-	return 0;
 }
 
 /*
drivers/staging/vt6656/iwctl.h +1 -1
index 22acf8b..0bab0d7 100644
@@ -97,7 +97,7 @@ int iwctl_siwessid(struct net_device *dev,
              struct iw_point *wrq,
              char *extra);
 
-int iwctl_giwessid(struct net_device *dev,
+void iwctl_giwessid(struct net_device *dev,
              struct iw_request_info *info,
              struct iw_point *wrq,
              char *extra);
drivers/staging/vt6656/main_usb.c +2 -2
index 373df75..16c82d3 100644
@@ -1657,8 +1657,8 @@ static int  device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
 		{
 			char essid[IW_ESSID_MAX_SIZE+1];
 			if (wrq->u.essid.pointer) {
-				rc = iwctl_giwessid(dev, NULL,
-						    &(wrq->u.essid), essid);
+				iwctl_giwessid(dev, NULL,
+					    &(wrq->u.essid), essid);
 				if (copy_to_user(wrq->u.essid.pointer,
 						         essid,
 						         wrq->u.essid.length) )
Signature · 1 line
1.7.4.4