]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: wilc1000: Logical continuations should be on the previous line
authorArushi Singhal <arushisinghal19971997@gmail.com>
Sat, 4 Mar 2017 15:57:40 +0000 (21:27 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Mar 2017 05:53:30 +0000 (06:53 +0100)
This patch fixes the checkpatch issue:
CHECK: Logical continuations should be on the previous line.

Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/wilc_spi.c
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

index fb7ccfc29a19371c4213e977f7dcf24e3b31b59a..5e28adc9537130d592f4ae1672758db6df544777 100644 (file)
@@ -454,8 +454,8 @@ static int spi_cmd_complete(struct wilc *wilc, u8 cmd, u32 adr, u8 *b, u32 sz,
                return N_FAIL;
        }
 
-       if ((cmd == CMD_INTERNAL_READ) || (cmd == CMD_SINGLE_READ)
-           || (cmd == CMD_DMA_READ) || (cmd == CMD_DMA_EXT_READ)) {
+       if ((cmd == CMD_INTERNAL_READ) || (cmd == CMD_SINGLE_READ) ||
+           (cmd == CMD_DMA_READ) || (cmd == CMD_DMA_EXT_READ)) {
                int retry;
                /* u16 crc1, crc2; */
                u8 crc[2];
index 7382e657583963f87d1c1481771d105bfa17a2a2..a37896fcd683061d31c0de550798043a517ce913 100644 (file)
@@ -765,8 +765,8 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
                }
        }
 
-       if ((sme->crypto.wpa_versions & NL80211_WPA_VERSION_1)
-           || (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)) {
+       if ((sme->crypto.wpa_versions & NL80211_WPA_VERSION_1) ||
+           (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)) {
                for (i = 0; i < sme->crypto.n_ciphers_pairwise; i++) {
                        if (sme->crypto.ciphers_pairwise[i] == WLAN_CIPHER_SUITE_TKIP)
                                u8security = u8security | TKIP;
@@ -1497,8 +1497,8 @@ void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size)
                                                        }
                                                }
                                                if (p2p_local_random > p2p_recv_random) {
-                                                       if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP
-                                                             || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
+                                                       if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP ||
+                                                            buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
                                                                for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {
                                                                        if (buff[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buff[i + 2], 4))) {
                                                                                WILC_WFI_CfgParseRxAction(&buff[i + 6], size - (i + 6));
@@ -1682,8 +1682,8 @@ static int mgmt_tx(struct wiphy *wiphy,
                                                        }
                                                }
 
-                                               if ((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP
-                                                     || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
+                                               if ((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP ||
+                                                    buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {
                                                        if (p2p_local_random > p2p_recv_random) {
                                                                for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {
                                                                        if (buf[i] == P2PELEM_ATTR_ID && !(memcmp(p2p_oui, &buf[i + 2], 4))) {