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.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 0e27fb1d9640b2e67f7b17de3f49ad837ffae550..d6c969a65cf8b21f08961c2c1e5e0b7d0bb1bf6d 100644 (file)
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -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;
 }
 
 /*

diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index 22acf8be8e7c08077f439a396aebbbc120701960..0bab0d755c5e42cddc4b63a38d6b64241cf8ba0b 100644 (file)
--- a/drivers/staging/vt6656/iwctl.h
+++ b/drivers/staging/vt6656/iwctl.h
@@ -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);

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 6213075030dc194214d18f15aefb9f576b6fabd2..91b953cb6d36fb1f67dcdc81259973683044c84f 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -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) )