Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2643617pxa; Mon, 24 Aug 2020 22:02:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNrjaipVjnF3zSeubF5QCpJSEusduhRtjxm6HCxQ2yRr/A9nO+F9/7J3FNzJw8IQz/5Ehm X-Received: by 2002:a17:906:4a4c:: with SMTP id a12mr1500359ejv.228.1598331753020; Mon, 24 Aug 2020 22:02:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598331753; cv=none; d=google.com; s=arc-20160816; b=gbRxKWigKhiP/EJAxbGvr7Qyii3RcV+vgutHyt3y+pT3ruFgQcV01n2vVz0BQZgQmd G0RX0MeFXSkgdikp2fKoLYNBteDgYFKFUkwYmhksSDAeV79HeBnAYLy/VLXFYbZThSif Wl60ijSHcKWeyb9WaNTLZImhStXJrgZXa4MHCaPyaT1iohsaiUJFB6ednKRQh/BC1Mih WsKmpTWmKP42EDCgYGvNjT4QbIXeQHLe3/15FnoBjhND9rpsHfuxQ3QJXmSOzCuNTTDJ fxjCDuLJVAMueMmDOsWx0e/Qs4WBEy8Ptd/R6L/DvzAz1ViEMugvV0N2wxBC5agDmjIM VNeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=80Rv3KCgLqBaCmDT70633jmqYaVJRMoe//CpQNhanR4=; b=Dh5qOvNs0WjlnzSoGFzaoYq5wsom89D5IX56uqCrjhM4H+jwOXODqF2gfBJGRpx2wD h0YWXm9VmIfwW9NS1gwjSrmwrd0da3MV5zPieHERt+AeSzIbn8BLDL2rMyt77q7I0fQ4 j7dvwk/Rq45L77P9QdkWlw3AB2FluIkJvZUqpu+SZZLnpdT1sApxToSDIz/rQPuxUjzc HIV5ISIWGbtXP7leXo2okY4IxS++jQCnHxLtmJTKDNVxsgPBZnIA/jOuO1vupAwxu4LK aup37eV3rFPiGOt6zW/nTUJuaF0gO/E+If1RyCJRex9Rp8aJgury9IaOZWwM7QX+eeW1 X7Ww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d20si8057311ejz.445.2020.08.24.22.02.10; Mon, 24 Aug 2020 22:02:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729035AbgHYE7U (ORCPT + 99 others); Tue, 25 Aug 2020 00:59:20 -0400 Received: from smtprelay0235.hostedemail.com ([216.40.44.235]:59174 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728565AbgHYE4x (ORCPT ); Tue, 25 Aug 2020 00:56:53 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay02.hostedemail.com (Postfix) with ESMTP id 0B8231E04; Tue, 25 Aug 2020 04:56:51 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:2903:3138:3139:3140:3141:3142:3353:3865:3868:3874:4250:4321:5007:6119:6261:7903:10004:10848:11026:11658:11914:12043:12296:12297:12438:12555:12895:12986:13069:13311:13357:13894:14181:14384:14394:14721:21080:21611:21627:30054,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: fan66_0f1652527059 X-Filterd-Recvd-Size: 2259 Received: from joe-laptop.perches.com (unknown [47.151.133.149]) (Authenticated sender: joe@perches.com) by omf08.hostedemail.com (Postfix) with ESMTPA; Tue, 25 Aug 2020 04:56:49 +0000 (UTC) From: Joe Perches To: Jiri Kosina , Bartlomiej Zolnierkiewicz , Jens Axboe Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/29] ata: Avoid comma separated statements Date: Mon, 24 Aug 2020 21:56:02 -0700 Message-Id: <2a3979b0eab31224e53553ca01759eb072790a65.1598331148.git.joe@perches.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use semicolons and braces. Signed-off-by: Joe Perches --- drivers/ata/pata_icside.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c index 08543aeb0093..498383cb6e29 100644 --- a/drivers/ata/pata_icside.c +++ b/drivers/ata/pata_icside.c @@ -202,14 +202,19 @@ static void pata_icside_set_dmamode(struct ata_port *ap, struct ata_device *adev * Choose the IOMD cycle timing which ensure that the interface * satisfies the measured active, recovery and cycle times. */ - if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425) - iomd_type = 'D', cycle = 187; - else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500) - iomd_type = 'C', cycle = 250; - else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750) - iomd_type = 'B', cycle = 437; - else - iomd_type = 'A', cycle = 562; + if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425) { + iomd_type = 'D'; + cycle = 187; + } else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500) { + iomd_type = 'C'; + cycle = 250; + } else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750) { + iomd_type = 'B'; + cycle = 437; + } else { + iomd_type = 'A'; + cycle = 562; + } ata_dev_info(adev, "timings: act %dns rec %dns cyc %dns (%c)\n", t.active, t.recover, t.cycle, iomd_type); -- 2.26.0