From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79F33C433E6 for ; Sat, 30 Jan 2021 18:48:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E4A864DE4 for ; Sat, 30 Jan 2021 18:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232156AbhA3Ssk (ORCPT ); Sat, 30 Jan 2021 13:48:40 -0500 Received: from smtprelay0250.hostedemail.com ([216.40.44.250]:46402 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230045AbhA3Ssf (ORCPT ); Sat, 30 Jan 2021 13:48:35 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay07.hostedemail.com (Postfix) with ESMTP id AB223181D303C; Sat, 30 Jan 2021 18:47:52 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: paint73_001571e275b3 X-Filterd-Recvd-Size: 4233 Received: from [192.168.1.159] (unknown [47.151.137.21]) (Authenticated sender: joe@perches.com) by omf11.hostedemail.com (Postfix) with ESMTPA; Sat, 30 Jan 2021 18:47:51 +0000 (UTC) Message-ID: <719e0f14852d132a6649dbd5791fca17f251cb8e.camel@perches.com> Subject: Re: [PATCH 10/29] drm/i915: Avoid comma separated statements From: Joe Perches To: Jiri Kosina , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Sat, 30 Jan 2021 10:47:50 -0800 In-Reply-To: References: Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2020-08-24 at 21:56 -0700, Joe Perches wrote: > Use semicolons and braces. Ping? > Signed-off-by: Joe Perches > --- >  drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 8 +++++--- >  drivers/gpu/drm/i915/gt/intel_gt_requests.c | 6 ++++-- >  drivers/gpu/drm/i915/gt/selftest_workarounds.c | 6 ++++-- >  drivers/gpu/drm/i915/intel_runtime_pm.c | 6 ++++-- >  4 files changed, 17 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c > index 699125928272..114c13285ff1 100644 > --- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c > +++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c > @@ -323,10 +323,12 @@ static int __gen8_ppgtt_alloc(struct i915_address_space * const vm, >   } >   > >   spin_lock(&pd->lock); > - if (likely(!pd->entry[idx])) > + if (likely(!pd->entry[idx])) { >   set_pd_entry(pd, idx, pt); > - else > - alloc = pt, pt = pd->entry[idx]; > + } else { > + alloc = pt; > + pt = pd->entry[idx]; > + } >   } >   > >   if (lvl) { > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c > index 66fcbf9d0fdd..54408d0b5e6e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c > @@ -139,8 +139,10 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout) >   LIST_HEAD(free); >   > >   interruptible = true; > - if (unlikely(timeout < 0)) > - timeout = -timeout, interruptible = false; > + if (unlikely(timeout < 0)) { > + timeout = -timeout; > + interruptible = false; > + } >   > >   flush_submission(gt, timeout); /* kick the ksoftirqd tasklets */ >   spin_lock(&timelines->lock); > diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c > index febc9e6692ba..3e4cbeed20bd 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c > @@ -521,8 +521,10 @@ static int check_dirty_whitelist(struct intel_context *ce) >   > >   srm = MI_STORE_REGISTER_MEM; >   lrm = MI_LOAD_REGISTER_MEM; > - if (INTEL_GEN(engine->i915) >= 8) > - lrm++, srm++; > + if (INTEL_GEN(engine->i915) >= 8) { > + lrm++; > + srm++; > + } >   > >   pr_debug("%s: Writing garbage to %x\n", >   engine->name, reg); > diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c > index 153ca9e65382..f498f1c80755 100644 > --- a/drivers/gpu/drm/i915/intel_runtime_pm.c > +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c > @@ -201,8 +201,10 @@ __print_intel_runtime_pm_wakeref(struct drm_printer *p, >   unsigned long rep; >   > >   rep = 1; > - while (i + 1 < dbg->count && dbg->owners[i + 1] == stack) > - rep++, i++; > + while (i + 1 < dbg->count && dbg->owners[i + 1] == stack) { > + rep++; > + i++; > + } >   __print_depot_stack(stack, buf, PAGE_SIZE, 2); >   drm_printf(p, "Wakeref x%lu taken at:\n%s", rep, buf); >   }