Message ID | 20200723122446.1329773-33-lee.jones@linaro.org (mailing list archive) |
---|---|
State | Accepted |
Headers | show
Return-Path: <SRS0=JunS=BC=vger.kernel.org=linux-scsi-owner@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A5A113A4 for <patchwork-linux-scsi@patchwork.kernel.org>; Thu, 23 Jul 2020 12:26:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E657022B43 for <patchwork-linux-scsi@patchwork.kernel.org>; Thu, 23 Jul 2020 12:26:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="DSA8Goh5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729201AbgGWM0I (ORCPT <rfc822;patchwork-linux-scsi@patchwork.kernel.org>); Thu, 23 Jul 2020 08:26:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729056AbgGWMZa (ORCPT <rfc822;linux-scsi@vger.kernel.org>); Thu, 23 Jul 2020 08:25:30 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2715DC0619E2 for <linux-scsi@vger.kernel.org>; Thu, 23 Jul 2020 05:25:30 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id z15so4956723wrl.8 for <linux-scsi@vger.kernel.org>; Thu, 23 Jul 2020 05:25:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KfRjcVBQyIVpnmla/CO/rMmBV1Hu/Ib2qrKAPkp0wCE=; b=DSA8Goh5xSOvhp7gnzWJuGcX7RYXFFEc1KuCxdCEqA3DFTXzzlZCpu24uIQcE1ETxN WGqf7bnJ6O8tRMJh376Te3uLSd6JUNozEnnO4034E6o5Ay6++hq1s5zqCyzQMd0gIYQs LqQv2JY4Xe1KHsv4gbaN/LFGrH/MdgP7i06vAOKu4n8A7fCYCI60Kr+poaI20VmqmEV3 v9mEFsDfU5pE2WcIY2AOzc5L+r6BFDrDoT/6SBLLan4gqWQvtVab/CRb8gGemagLkVfM FEeYhuHITJqIkYfxwFAZGuTThQGZ7IwpHDjrfb5DBymj15B3uK2FxttvmVYeih+SAnX7 N+1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KfRjcVBQyIVpnmla/CO/rMmBV1Hu/Ib2qrKAPkp0wCE=; b=Mh6QA3AyOZIxi5Ag2+o05CtkqBAJpSUF5UlkmV8nXHTLdprdMx3W33rVVsrvrRDbZd OFYEGMXlgxyYj6cfUqHP3lurX9IHY2bfJo8PYJ6fOi9kyy33NyGp/ySDPkUQzCc6vK2n 4G8D7LtPFn9/qFuhFE9YAzuf9B1vuu1bf99hlka87hKFgR37I7YXMlXx3vTYopj4d0wl pg2TO1pUmbNMSGLYKR9hd7uta0uUmC59s7D1yCv19EbyTOM8CIj39o1jW4uWG4L3ekho /k1o0kxbbsUbmYm9zJmuPjmNhlhLJ5Rml6CHyD3808lI+i6OdKcZUaFaZUaEkz65TPdv sq4g== X-Gm-Message-State: AOAM531cWORgnF1QIqNodQre+WHRDinmqKDVSJpYCa7V6RxSyWMkw5lY vWCWMMG15BH9NS2fHyDP4GtcVT0hfGA= X-Google-Smtp-Source: ABdhPJwUDa3jAas4QHzpdFeBjvzWKbSJh44OokxCvtuT5rUq+RvFpNpBowdKGw7jam8C/fw0zKeLhg== X-Received: by 2002:adf:90ea:: with SMTP id i97mr3870556wri.102.1595507128920; Thu, 23 Jul 2020 05:25:28 -0700 (PDT) Received: from localhost.localdomain ([2.27.167.73]) by smtp.gmail.com with ESMTPSA id j5sm3510651wma.45.2020.07.23.05.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 05:25:28 -0700 (PDT) From: Lee Jones <lee.jones@linaro.org> To: jejb@linux.ibm.com, martin.petersen@oracle.com Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, Lee Jones <lee.jones@linaro.org>, Bradley Grove <linuxdrivers@attotech.com> Subject: [PATCH 32/40] scsi: esas2r: esas2r: Add braces around the one-line if() Date: Thu, 23 Jul 2020 13:24:38 +0100 Message-Id: <20200723122446.1329773-33-lee.jones@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200723122446.1329773-1-lee.jones@linaro.org> References: <20200723122446.1329773-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: <linux-scsi.vger.kernel.org> X-Mailing-List: linux-scsi@vger.kernel.org |
Series |
Set 5: Penultimate set of SCSI related W=1 warnings
|
expand
|
diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h index 7f43b95f4e945..e30d2f1f53685 100644 --- a/drivers/scsi/esas2r/esas2r.h +++ b/drivers/scsi/esas2r/esas2r.h @@ -1225,8 +1225,9 @@ static inline void esas2r_rq_init_request(struct esas2r_request *rq, /* req_table entry should be NULL at this point - if not, halt */ - if (a->req_table[LOWORD(vrq->scsi.handle)]) + if (a->req_table[LOWORD(vrq->scsi.handle)]) { esas2r_bugon(); + } /* fill in the table for this handle so we can get back to the * request.
In certain configurations esas2r_bugon() is sometimes NULLed by the compiler. Fixes the following W=1 kernel build warning(s): In file included from drivers/scsi/esas2r/esas2r_log.c:44: drivers/scsi/esas2r/esas2r.h: In function ‘esas2r_rq_init_request’: drivers/scsi/esas2r/esas2r.h:1229:17: warning: suggest braces around empty body in an ‘if’ statement [-Wempty-body] 1229 | esas2r_bugon(); | ^ NB: Lots of these - snipped for brevity Cc: Bradley Grove <linuxdrivers@attotech.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/scsi/esas2r/esas2r.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)