From 6422c6efb3b1d296ee2b79b6961a02952a75ee53 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Mon, 13 Mar 2017 17:38:18 +1100 Subject: staging: ks7010: fix line continuations Checkpatch emits CHECK: Logical continuations should be on the previous line. Also the same code section causes checkpatch to emit WARNING: Avoid multiple line dereference. Move logical line continuations onto the previous line. Move multiple line dereferences onto single line. Make these two changes in a single patch to give review a chance to critique the final layout of the *complex* logical statement. Signed-off-by: Tobin C. Harding Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks_hostif.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'drivers/staging/ks7010') diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c index 54ff06d..461482b 100644 --- a/drivers/staging/ks7010/ks_hostif.c +++ b/drivers/staging/ks7010/ks_hostif.c @@ -332,16 +332,13 @@ int hostif_data_indication_wpa(struct ks_wlan_private *priv, priv->nstats.rx_errors++; return -EINVAL; } - if (((auth_type == TYPE_PMK1 - && priv->wpa.pairwise_suite == - IW_AUTH_CIPHER_TKIP) || (auth_type == TYPE_GMK1 - && priv->wpa. - group_suite == - IW_AUTH_CIPHER_TKIP) - || (auth_type == TYPE_GMK2 - && priv->wpa.group_suite == - IW_AUTH_CIPHER_TKIP)) - && priv->wpa.key[auth_type - 1].key_len) { + if (((auth_type == TYPE_PMK1 && + priv->wpa.pairwise_suite == IW_AUTH_CIPHER_TKIP) || + (auth_type == TYPE_GMK1 && + priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP) || + (auth_type == TYPE_GMK2 && + priv->wpa.group_suite == IW_AUTH_CIPHER_TKIP)) && + priv->wpa.key[auth_type - 1].key_len) { DPRINTK(4, "TKIP: protocol=%04X: size=%u\n", eth_proto, priv->rx_size); /* MIC save */ -- cgit v1.1