From patchwork Sat Mar 26 00:49:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cosmin-Gabriel Samoila X-Patchwork-Id: 602136 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qX1mm2prGz9sBG for ; Sat, 26 Mar 2016 11:50:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=SPEc1oPw; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752787AbcCZAuK (ORCPT ); Fri, 25 Mar 2016 20:50:10 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35806 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752074AbcCZAuI (ORCPT ); Fri, 25 Mar 2016 20:50:08 -0400 Received: by mail-wm0-f65.google.com with SMTP id 139so1139662wmn.2; Fri, 25 Mar 2016 17:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=Gy/8IU3NEpV/GA0sPvlCL5/O6cU3kHoykcB/Rk6R3aE=; b=SPEc1oPwQsmBUrqiRYMvJfppt1Yo0rh9oEKLHKH18XB+s88LGKE9NW0FZbcHituzzD PjzkbmMh0KEYuuTPTBAkXGng/B8nJH8+2URnN3ErA7rpdY6ku8CvK6qMOtLcvMjLf2in Jsnzo26ni29bOaNGW40fXjLgofBKqrioC6PO1rQbZ6pXMdDek9g200A8ZV9G+4sv4m8X DBLhrZGtmP6Rhdog4CCKebQ61d+rA7n6AlgxHScrqL/ByeSNSenLSCEiWjq1DYmgP/f1 M8AJbUHKIYmqpuOw+ql2+geN9WKwlHnlTpfzlsS+xPZo7eXJxWZEpu6BZ2xXsngSkygh uPHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Gy/8IU3NEpV/GA0sPvlCL5/O6cU3kHoykcB/Rk6R3aE=; b=mNo2SCnEemn+53AZsNkMQsyt3yLmbT0il6FFvLm/gHPKIXloTcxPomBa99zStEAs6g 2odOE6WQnAEWZcXRqceuIgUDocqAOXL0PdBSLXJdiAJfYgJdKFV3dU+tJ5tnMU7DHdGC wFDEVNERtWX8BI12mQR7yOn0kj5+UuY6ZlY2i3TXm5fk/Z9qCyZ3E1DFG3LD4JmJ4Zho rRbzNxFEIHZc8X5QoVO/i7W/x8ZjLbSs7aYr7qXEQNgDGvsUqUMvhvtU4WvDFuk9IYuj zFKvCHOh06TYVz4bK5FAcrWdwa+APJFYJr5BGY4nmyZ64NFfAGpEndunQYqYUmLI9+Hj Ecew== X-Gm-Message-State: AD7BkJK9S48QUXpQQbcFjwMNkblotIdizeGH8IulGhlvYwbLCJ28y6Wlfon5WrqdWseGyg== X-Received: by 10.28.131.141 with SMTP id f135mr971423wmd.33.1458953407291; Fri, 25 Mar 2016 17:50:07 -0700 (PDT) Received: from localhost.localdomain ([109.98.86.228]) by smtp.googlemail.com with ESMTPSA id g203sm989125wmf.23.2016.03.25.17.50.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Mar 2016 17:50:06 -0700 (PDT) From: Cosmin-Gabriel Samoila To: isdn@linux-pingi.de Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Cosmin-Gabriel Samoila Subject: [PATCH] Drivers: isdn: hisax: isac.c: Fix assignment and check into one expression. Date: Sat, 26 Mar 2016 02:49:50 +0200 Message-Id: <1458953390-7306-1-git-send-email-gabrielcsmo@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix variable assignment inside if statement. It is error-prone and hard to read. Signed-off-by: Cosmin-Gabriel Samoila --- drivers/isdn/hisax/isac.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c index 7fdf78f..df7e05c 100644 --- a/drivers/isdn/hisax/isac.c +++ b/drivers/isdn/hisax/isac.c @@ -215,9 +215,11 @@ isac_interrupt(struct IsdnCardState *cs, u_char val) if (count == 0) count = 32; isac_empty_fifo(cs, count); - if ((count = cs->rcvidx) > 0) { + count = cs->rcvidx; + if (count > 0) { cs->rcvidx = 0; - if (!(skb = alloc_skb(count, GFP_ATOMIC))) + skb = alloc_skb(count, GFP_ATOMIC); + if (!skb) printk(KERN_WARNING "HiSax: D receive out of memory\n"); else { memcpy(skb_put(skb, count), cs->rcvbuf, count); @@ -251,7 +253,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val) cs->tx_skb = NULL; } } - if ((cs->tx_skb = skb_dequeue(&cs->sq))) { + cs->tx_skb = skb_dequeue(&cs->sq); + if (cs->tx_skb) { cs->tx_cnt = 0; isac_fill_fifo(cs); } else @@ -313,7 +316,8 @@ afterXPR: #if ARCOFI_USE if (v1 & 0x08) { if (!cs->dc.isac.mon_rx) { - if (!(cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) { + cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC); + if (!cs->dc.isac.mon_rx) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "ISAC MON RX out of memory!"); cs->dc.isac.mocr &= 0xf0; @@ -343,7 +347,8 @@ afterXPR: afterMONR0: if (v1 & 0x80) { if (!cs->dc.isac.mon_rx) { - if (!(cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) { + cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC); + if (!cs->dc.isac.mon_rx) { if (cs->debug & L1_DEB_WARN) debugl1(cs, "ISAC MON RX out of memory!"); cs->dc.isac.mocr &= 0x0f;