From patchwork Sat Feb 7 19:05:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bas Peters X-Patchwork-Id: 437612 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 F1A29140172 for ; Sun, 8 Feb 2015 06:07:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758235AbbBGTFo (ORCPT ); Sat, 7 Feb 2015 14:05:44 -0500 Received: from mail-we0-f182.google.com ([74.125.82.182]:50112 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757235AbbBGTFm (ORCPT ); Sat, 7 Feb 2015 14:05:42 -0500 Received: by mail-we0-f182.google.com with SMTP id l61so19532837wev.13; Sat, 07 Feb 2015 11:05:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+ZuNkRRSqBVfn4I5i1CFKnCzLnvbqU8HCyiMb9vjJ5c=; b=hZQ8N5eb3eRm981I9H7qEDSTHTAhTZZdvJn5ZR/vx5kjbexp91kGZIE4GwSEJEz63a P4fflvFUgo+HM3OjD1iHCYjTIOV1EaRkpGbDhkojqRGX+stmGxSUmN8wTHv3ZnDLkPt9 e6HFZkqQPuC2eTTGqN5nuqinRHGnDLD7zAqGBMeScPUjYEeiCdvGjTeFFa7E4GvtKazN Y77agV8B/ky0MOPr1S+IAf9rp1cQ329zzyxCCbG7+Ku2gwdh1Be+erNA5pafBVl88dq+ xVzYo0SD7Wk44joZw/0Jhtj2O0oqM3jUsMIO/fQkmJpS+6c930iZcnKBnCJ9sobr+rfd kV/w== X-Received: by 10.194.189.138 with SMTP id gi10mr22762365wjc.86.1423335941081; Sat, 07 Feb 2015 11:05:41 -0800 (PST) Received: from localhost ([2a02:1810:cc28:1600:5ec5:d4ff:fe65:1657]) by mx.google.com with ESMTPSA id cb14sm6755608wib.22.2015.02.07.11.05.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Feb 2015 11:05:40 -0800 (PST) From: Bas Peters To: isdn@linux-pingi.de Cc: julia.lawall@lip6.fr, davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, sergei.shtylyov@cogentembedded.com, Bas Peters Subject: [PATCH 1/7] drivers: isdn: act2000: act2000_isa.c: Fix checkpatch errors Date: Sat, 7 Feb 2015 20:05:23 +0100 Message-Id: <1423335929-24926-2-git-send-email-baspeters93@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1423335929-24926-1-git-send-email-baspeters93@gmail.com> References: <1423335929-24926-1-git-send-email-baspeters93@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adresses various checkpatch errors: 3 assignments in if conditions 1 return value enclosed in parenthesis Signed-off-by: Bas Peters --- drivers/isdn/act2000/act2000_isa.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c index b5fad29..048507e 100644 --- a/drivers/isdn/act2000/act2000_isa.c +++ b/drivers/isdn/act2000/act2000_isa.c @@ -31,7 +31,8 @@ act2000_isa_reset(unsigned short portbase) int serial = 0; found = 0; - if ((reg = inb(portbase + ISA_COR)) != 0xff) { + reg = inb(portbase + ISA_COR); + if (reg != 0xff) { outb(reg | ISA_COR_RESET, portbase + ISA_COR); mdelay(10); outb(reg, portbase + ISA_COR); @@ -303,7 +304,8 @@ act2000_isa_send(act2000_card *card) while (1) { spin_lock_irqsave(&card->lock, flags); if (!(card->sbuf)) { - if ((card->sbuf = skb_dequeue(&card->sndq))) { + card->sbuf = skb_dequeue(&card->sndq); + if (card->sbuf) { card->ack_msg = card->sbuf->data; msg = (actcapi_msg *)card->sbuf->data; if ((msg->hdr.cmd.cmd == 0x86) && @@ -378,7 +380,8 @@ act2000_isa_getid(act2000_card *card) printk(KERN_WARNING "act2000: Wrong Firmware-ID!\n"); return -EPROTO; } - if ((p = strchr(fid.revision, '\n'))) + p = strchr(fid.revision, '\n'); + if (p) *p = '\0'; printk(KERN_INFO "act2000: Firmware-ID: %s\n", fid.revision); if (card->flags & ACT2000_FLAGS_IVALID) { @@ -439,5 +442,5 @@ act2000_isa_download(act2000_card *card, act2000_ddef __user *cb) } kfree(buf); msleep_interruptible(500); - return (act2000_isa_getid(card)); + return act2000_isa_getid(card); }