staging: ks7010: refactor LOCAL_EEPROM_SUM case in hostif_mib_get_confirm
authorSergio Paracuellos <sergio.paracuellos@gmail.com>
Fri, 4 May 2018 04:16:46 +0000 (06:16 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 May 2018 01:58:41 +0000 (18:58 -0700)
This commit simplify conditional paths in LOCAL_EEPROM_SUM case
inside hostif_mib_get_confirm function. It change logic to handle
invalid values first and assign good ones at the end if it is the
case.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ks7010/ks_hostif.c

index 7a511231225feaeb04887324d3e21f86a40ec261..3db5679cdaf506fd7cddfc10182551439702875f 100644 (file)
@@ -504,18 +504,15 @@ void hostif_mib_get_confirm(struct ks_wlan_private *priv)
                break;
        case LOCAL_EEPROM_SUM:
                memcpy(&priv->eeprom_sum, priv->rxp, sizeof(priv->eeprom_sum));
-               if (priv->eeprom_sum.type == 0) {
-                       priv->eeprom_checksum = EEPROM_CHECKSUM_NONE;
-               } else if (priv->eeprom_sum.type == 1) {
-                       if (priv->eeprom_sum.result == 0) {
-                               priv->eeprom_checksum = EEPROM_NG;
-                               netdev_info(dev, "LOCAL_EEPROM_SUM NG\n");
-                       } else if (priv->eeprom_sum.result == 1) {
-                               priv->eeprom_checksum = EEPROM_OK;
-                       }
-               } else {
+               if (priv->eeprom_sum.type != 0 &&
+                   priv->eeprom_sum.type != 1) {
                        netdev_err(dev, "LOCAL_EEPROM_SUM error!\n");
+                       return;
                }
+               priv->eeprom_checksum = (priv->eeprom_sum.type == 0) ?
+                                        EEPROM_CHECKSUM_NONE :
+                                        (priv->eeprom_sum.result == 0) ?
+                                        EEPROM_NG : EEPROM_OK;
                break;
        default:
                netdev_err(priv->net_dev, "mib_attribute=%08x\n",