staging: vt6655: Remove unused code inside switch case

This patch removes dead code in private_ioctl function and
iwctl_siwmode function, in file ioctl.c.

Inside switch, for a case no code gets executed
after break.

This was detected by smatch.

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
index 628f5b2..c2b6763 100644 (file)
--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@@ -45,7 +45,6 @@ int private_ioctl(struct vnt_private *pDevice, struct ifreq *rq)
        int             result = 0;
        PWLAN_IE_SSID   pItemSSID;
        SCmdBSSJoin     sJoinCmd;
-       SCmdZoneTypeSet sZoneTypeCmd;
        SCmdScan        sScanCmd;
        SCmdStartAP     sStartAPCmd;
        SCmdSetWEP      sWEPCmd;
@@ -108,45 +107,6 @@ int private_ioctl(struct vnt_private *pDevice, struct ifreq *rq)
                result = -EOPNOTSUPP;
                break;
 
-               if (copy_from_user(&sZoneTypeCmd, pReq->data, sizeof(SCmdZoneTypeSet))) {
-                       result = -EFAULT;
-                       break;
-               }
-
-               if (sZoneTypeCmd.bWrite == true) {
-                       /* write zonetype */
-                       if (sZoneTypeCmd.ZoneType == ZoneType_USA) {
-                               /* set to USA */
-                               pr_debug("set_ZoneType:USA\n");
-                       } else if (sZoneTypeCmd.ZoneType == ZoneType_Japan) {
-                               /* set to Japan */
-                               pr_debug("set_ZoneType:Japan\n");
-                       } else if (sZoneTypeCmd.ZoneType == ZoneType_Europe) {
-                               /* set to Europe */
-                               pr_debug("set_ZoneType:Europe\n");
-                       }
-               } else {
-                       /* read zonetype */
-                       unsigned char zonetype = 0;
-
-                       if (zonetype == 0x00) {         /* USA */
-                               sZoneTypeCmd.ZoneType = ZoneType_USA;
-                       } else if (zonetype == 0x01) {  /* Japan */
-                               sZoneTypeCmd.ZoneType = ZoneType_Japan;
-                       } else if (zonetype == 0x02) {  /* Europe */
-                               sZoneTypeCmd.ZoneType = ZoneType_Europe;
-                       } else {                        /* Unknown ZoneType */
-                               pr_err("Error:ZoneType[%x] Unknown ???\n", zonetype);
-                               result = -EFAULT;
-                               break;
-                       }
-                       if (copy_to_user(pReq->data, &sZoneTypeCmd, sizeof(SCmdZoneTypeSet))) {
-                               result = -EFAULT;
-                               break;
-                       }
-               }
-               break;
-
        case WLAN_CMD_BSS_JOIN:
                if (pDevice->bMACSuspend == true) {
                        if (pDevice->bRadioOff == true)

diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 8f3e190..cc261d7 100644 (file)
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -464,15 +464,6 @@ int iwctl_siwmode(struct net_device *dev,
                rc = -EOPNOTSUPP;
                break;
 
-               if (pMgmt->eConfigMode != WMAC_CONFIG_AP) {
-                       pMgmt->eConfigMode = WMAC_CONFIG_AP;
-                       if (pDevice->flags & DEVICE_FLAGS_OPENED)
-                               pDevice->bCommit = true;
-
-               }
-               pr_debug("set mode to Access Point\n");
-               break;
-
        case IW_MODE_REPEAT:
                pMgmt->eConfigMode = WMAC_CONFIG_ESS_STA;
                rc = -EOPNOTSUPP;