From patchwork Fri Jul 31 06:35:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 502409 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E05131402D2 for ; Fri, 31 Jul 2015 16:38:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=LHWlOVP/; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id ADF651A1C11 for ; Fri, 31 Jul 2015 16:38:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=LHWlOVP/; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 07EED1A05A6 for ; Fri, 31 Jul 2015 16:37:25 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=LHWlOVP/; dkim-atps=neutral Received: by ozlabs.org (Postfix) id E5193140328; Fri, 31 Jul 2015 16:37:24 +1000 (AEST) Delivered-To: linuxppc-dev@ozlabs.org Received: from mail-pa0-x234.google.com (mail-pa0-x234.google.com [IPv6:2607:f8b0:400e:c03::234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CA20614031E for ; Fri, 31 Jul 2015 16:37:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=LHWlOVP/; dkim-atps=neutral Received: by pabkd10 with SMTP id kd10so35843950pab.2 for ; Thu, 30 Jul 2015 23:37:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=8ZOSLvJ1eo4NmPg6fRMa9DfCbqsFrDchPaEPozji1iI=; b=LHWlOVP/2R4UQFAoDkCizEg0I32wT8EP+8rEt+abdxOZPY52qyQ7ufXcQiB07myLbZ J+Gn1FjdDf4cLzq1DzsMX+c7rQe/P0dwX+W+6XcT8bLRBAJJBxcMY1Ov4N15MFGUk15E h+G8VnU2x4YXBivmHFRsYEeblhkVXIOwC+Gio= 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:mime-version :content-type:content-transfer-encoding; bh=8ZOSLvJ1eo4NmPg6fRMa9DfCbqsFrDchPaEPozji1iI=; b=kc654xGyVQm+oKOLUlCK9pMixx/bT4mOc6lBs2It93+lBs+7seypjjHyC3JYaYqLG3 peZUIvgAqlVXDdCdkHl36gqauCQA+/5YcvLXqjuOWJL7pz+rqBTLgNfbP/jpiZxx2Cyi FIv9ZD8/gWFC/LERqMrlvSZxVHEP5atz7qGjYEH3PQb0MpH1FcZvDaDc8PYnRiFnUEGC 0VjExcCmUxAHhPuuvgsS72lAce6wEGZD28KTV1w3P1KpZJLtlsC7kTTcKtfJfJu/h3QT 5E+HVmLpr388arucfIULdCEGLDGnD4TXwWE3ZiyBUR2D8gjS9QiLMtY5AnnvQdBvbNx2 edeA== X-Gm-Message-State: ALoCoQn3d4GM4YHtX1cwU3n2p8nXZNOxNyeoo+SJM/bAauvvCVgPeXnxEufg8xsCfJrx28yRTNiV X-Received: by 10.66.157.195 with SMTP id wo3mr3349443pab.17.1438324641017; Thu, 30 Jul 2015 23:37:21 -0700 (PDT) Received: from gamma.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id cj7sm5568555pdb.33.2015.07.30.23.37.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Jul 2015 23:37:20 -0700 (PDT) From: Daniel Axtens To: linuxppc-dev@ozlabs.org Subject: [PATCH] cxl: Fix ambiguous else warnings Date: Fri, 31 Jul 2015 16:35:08 +1000 Message-Id: <1438324508-30341-1-git-send-email-dja@axtens.net> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mikey@neuling.org, Daniel Axtens , imunsie@au.ibm.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Every time I build cxl I see the following warnings: /scratch/dja/linux-capi/drivers/misc/cxl/pci.c: In function ‘sanitise_afu_regs’: /scratch/dja/linux-capi/drivers/misc/cxl/pci.c:712:6: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (reg & CXL_PSL_DSISR_TRANS) ^ /scratch/dja/linux-capi/drivers/misc/cxl/irq.c: In function ‘fail_psl_irq’: /scratch/dja/linux-capi/drivers/misc/cxl/irq.c:184:5: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses] if (irq_info->dsisr & CXL_PSL_DSISR_TRANS) ^ They're annoying. Fix them by inserting the braces. Signed-off-by: Daniel Axtens --- drivers/misc/cxl/irq.c | 5 +++-- drivers/misc/cxl/pci.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c index 121ec48f3ab4..c11e583a15a9 100644 --- a/drivers/misc/cxl/irq.c +++ b/drivers/misc/cxl/irq.c @@ -181,10 +181,11 @@ static irqreturn_t cxl_irq(int irq, void *data, struct cxl_irq_info *irq_info) static irqreturn_t fail_psl_irq(struct cxl_afu *afu, struct cxl_irq_info *irq_info) { - if (irq_info->dsisr & CXL_PSL_DSISR_TRANS) + if (irq_info->dsisr & CXL_PSL_DSISR_TRANS) { cxl_p2n_write(afu, CXL_PSL_TFC_An, CXL_PSL_TFC_An_AE); - else + } else { cxl_p2n_write(afu, CXL_PSL_TFC_An, CXL_PSL_TFC_An_A); + } return IRQ_HANDLED; } diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 6d2e538331b6..29c7e4eb309a 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -709,10 +709,11 @@ static int sanitise_afu_regs(struct cxl_afu *afu) reg = cxl_p2n_read(afu, CXL_PSL_DSISR_An); if (reg) { dev_warn(&afu->dev, "AFU had pending DSISR: %#.16llx\n", reg); - if (reg & CXL_PSL_DSISR_TRANS) + if (reg & CXL_PSL_DSISR_TRANS) { cxl_p2n_write(afu, CXL_PSL_TFC_An, CXL_PSL_TFC_An_AE); - else + } else { cxl_p2n_write(afu, CXL_PSL_TFC_An, CXL_PSL_TFC_An_A); + } } reg = cxl_p1n_read(afu, CXL_PSL_SERR_An); if (reg) {