From patchwork Thu Aug 24 23:09:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 110967 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp135897qge; Thu, 24 Aug 2017 16:13:12 -0700 (PDT) X-Received: by 10.84.131.130 with SMTP id d2mr8484498pld.16.1503616392086; Thu, 24 Aug 2017 16:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503616392; cv=none; d=google.com; s=arc-20160816; b=GQpP82xr8RvkVjn78RxfamJC+w0Xh3dwdnP31LY7466+upNUSQlq04fCEpsfxvbEgZ gtlB0jCJFgLIDVnY4ouqX/KSH46naelZ1apmS1V1WPDKKK9khOK2dJoDXVhWx6kuO6M9 1YdJrWuzoOzuBZ7x14DIAhtjgFbsM9YbWBrWT6o4HyD0DVn4uWbIidnoQ4A/+cQ3jSz/ hHdZJQugCvDCtwY6ClHvftO+hZj5JFUShz0Xl1+QgfufcT+lXNBK64tWzyQGKDJ8dmiK KvNIStHjSdcHkuxf5ATrNn+HBbWrLOo5UaG/2Dv9ZXEXlXhKEnLVWAu9gV+7sM2c+kq3 R7dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=d6adZrZ/e0eun0xkPi3fwPLrwakwrCNeSbuSTeHmyS8=; b=rKdRp7Vr3Y9Cvl5OwVnowSXzrriYapSdVmnIVbxJrmJ7+UzeQNanqF+ElePun5IMKh k6wa7S1s9QH6A1NrjLV8XHerjttJZNRtIlf6+YCc/hOlQr3+bnItcpV+SeXvlarzN9MJ V8zCsrmdnh8OUulJ19XdFyjPQyYSQxwYLc36Z3brq6m/C67lS7NRe7AU4+lqXe9MCZZG MlNRqoYBQPnbFp4fuITiWkO6xI+4thca8+dc05b349p80sQvWLvCjn2sfVj7I6j860UQ DN+/+jF1D3VpaOxx+OtIIkWAeWYLRsPjdav25k6RvB+vBA7SDanMDZoQY9klR74bV3Li ihDA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u11si3831525plm.608.2017.08.24.16.13.11; Thu, 24 Aug 2017 16:13:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754172AbdHXXNI (ORCPT + 26 others); Thu, 24 Aug 2017 19:13:08 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:55651 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753702AbdHXXNH (ORCPT ); Thu, 24 Aug 2017 19:13:07 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0LxKXe-1dV9JB38rS-016yBn; Fri, 25 Aug 2017 01:10:19 +0200 From: Arnd Bergmann To: James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Hannes Reinecke , Johannes Thumshirn , Dan Carpenter , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] scsi: lpfc: avoid an unused function warning Date: Fri, 25 Aug 2017 01:09:59 +0200 Message-Id: <20170824231016.1843118-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:985d7LTdqjYRheLG9Y7PCkjRHpqHlIneRgAif3Tm2FaTAEpVjvW 2z7djQiD6YDpp3dXAPjQaPjYWtombpIlfULvDOzw/yttjVxTO2nIv5drXiHlIqzDwJX6tu2 9juk7He3aCN2jQPfNHEesgzfEZjSMQ67i5TvqHGE78GBZblMFzMEw0/SfGzFroDamSg3RAl LPF0nb8A1AzxXCTFYqbKw== X-UI-Out-Filterresults: notjunk:1; V01:K0:g/dtvsbj+Jw=:/vD1gI1pcbYzIch9+ZoPS/ ECPDSEGBpEIchFKFT+RES95OqQc7BBGr0rzzqrnqNUFLzbqv5y3i2gT6g/qcqF+DX4KorJzBa 1hbAs4oScyj7waAT0772++au9QQ47j6zQuKhGvxBU/AUTKm0A3TUzXG+T8J/w8sOTqSLmeyr0 FbQt1a+dEcCtQTBDmboaThJXYLihnvDEdOgyO5rjattJ8OnkyYn3DjbsLz6aatuDSQgkYTz7U txBP1WbtC77MtI9xfJ91vQcETXrHKcvx4O7wRzSnJ1cl/lqaSRk34uORqvImPtz5aILMvVtLM 0yn78V6OpHlvb2h+ydxO9X55oeTiR1/5ztzy2yOi9f0Rxn60+9IZB2OimMK79VoGkU2co+WyG hWkyXK1Wuc9AOYKrEm0OrGKiOj41qiXral3GXCgImM3EVQgqzzklf1fxkZORmWNjO3xEmgIrr u/HUhSkGnYBXmY7CLpFPTuu8hmU5rUdTzcxzGz+rlmEWi5iLiUsBQygFUDPxgPFG723BWCqei sOOf2/JrHnNSkKshz+j6FiE4PP45h00eDz1UNzScolHJW47AvzOns1aPEspKkZTJT56q33RBb VJ5lOnHEghFUrzLf/yt39Ay/N/qLW0HUvc5Rjug1ycoOm+YKhnPMJBeg8mA/hQGdGUa7FMoBP dwhkqss8a/FLAmYcYIKA7TObgFRTjIfRKGl1QaeDk9Fp9jRk0eH60UzsP1lM3NSYP0F1Kq7ch KpDmtzl2yXV02FAHMCDPgqKf6adHiAuWaCOVJw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only reference to lpfc_nvmet_replenish_context() is inside of an #ifdef, leading to a harmless warning when CONFIG_NVME_TARGET_FC is disabled: drivers/scsi/lpfc/lpfc_nvmet.c:1457:1: error: 'lpfc_nvmet_replenish_context' defined but not used [-Werror=unused-function] This replaces the preprocessor conditional with a C condition, so the compiler can see that the function is intentionally unused. Fixes: 9a38e4f1c82f ("scsi: lpfc: Fix MRQ > 1 context list handling") Signed-off-by: Arnd Bergmann --- drivers/scsi/lpfc/lpfc_nvmet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c index 48a1c0c27a3f..0b7c1a49e203 100644 --- a/drivers/scsi/lpfc/lpfc_nvmet.c +++ b/drivers/scsi/lpfc/lpfc_nvmet.c @@ -1527,7 +1527,6 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba, struct rqb_dmabuf *nvmebuf, uint64_t isr_timestamp) { -#if (IS_ENABLED(CONFIG_NVME_TARGET_FC)) struct lpfc_nvmet_rcv_ctx *ctxp; struct lpfc_nvmet_tgtport *tgtp; struct fc_frame_header *fc_hdr; @@ -1541,6 +1540,9 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba, uint32_t id; #endif + if (!IS_ENABLED(CONFIG_NVME_TARGET_FC)) + return; + ctx_buf = NULL; if (!nvmebuf || !phba->targetport) { lpfc_printf_log(phba, KERN_ERR, LOG_NVME_IOERR, @@ -1695,7 +1697,6 @@ lpfc_nvmet_unsol_fcp_buffer(struct lpfc_hba *phba, if (nvmebuf) lpfc_rq_buf_free(phba, &nvmebuf->hbuf); /* repost */ -#endif } /** From patchwork Thu Aug 24 23:10:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 110966 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp134611qge; Thu, 24 Aug 2017 16:11:47 -0700 (PDT) X-Received: by 10.98.194.155 with SMTP id w27mr7902697pfk.246.1503616307322; Thu, 24 Aug 2017 16:11:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503616307; cv=none; d=google.com; s=arc-20160816; b=eckpTfdeH1wUwnfK3HFH11J1O7I7TsnO+15KQdP3bxBjBeAInbJV0CuJpp+vDD0i8e 4CNpa7Ne2bvjuxOg+P9uoa+6pZm3As/3L6f7CsJB7MSQk5R3rOEqtXgAtuVHx1w8FK5j CeKlX8opO4eWvHFjXpc4msQQSFl83CjLQk92HhD8mZBdvdzeA83mFAPuDFVPyJ9Yl3Jj W3g6hsOTz2XzxaB3NyGW2XFA8gnVJfHqC1HMy4XQywEW5X5TZGEkgxR4jFJGGKZ8drWL fYl30TXlsq46SG7HKIuedTv1/E5DuGFcfK50t+jrYkcp+9qVtAhx6fshrdKPs5oiztfF PLlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=nPnEeD/qsIbBAj7N71feErIhYhnGjC5iz7BbKpT+YAA=; b=lfqCTn3/bt2Os6jqE8y3m447xMMtD0suuzK9UhugPXBg5hUaaln0mQ60CsdgpOphZP 6ax3NDBBA31y0PgVzVuL0VQB/SpRKssmwqQa42jMvZsPRVLUh5dkU83mg6EPS0Ku/J+z tfp/TdMO6W85Y4AQGdPX2YJoRaaDVwn+wQCum4A6Sd/VP6MZYQbTb53v4Jvr9lxubUS5 qxjJ1pq3RfjiDMwT1FswVD/RQSB9q7IvpdA/iT0c4WuabX/5Xk3w6vAogZzmzIwk2PrV pLiLsNGu9r7TgyMMiIZ4DnZ94egRh5fLZzcg+u8yv4Y3E7k1ydZFk1Gxnf3Wn/rNTkAV ZwMw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si3541411pfc.518.2017.08.24.16.11.46; Thu, 24 Aug 2017 16:11:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754090AbdHXXLo (ORCPT + 26 others); Thu, 24 Aug 2017 19:11:44 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:63052 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411AbdHXXLn (ORCPT ); Thu, 24 Aug 2017 19:11:43 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MaG7g-1e0LCG3VBw-00Ju7V; Fri, 25 Aug 2017 01:10:28 +0200 From: Arnd Bergmann To: James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Arnd Bergmann , Hannes Reinecke , Johannes Thumshirn , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/2] scsi: lpfc: avoid false-positive gcc-8 warning Date: Fri, 25 Aug 2017 01:10:00 +0200 Message-Id: <20170824231016.1843118-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170824231016.1843118-1-arnd@arndb.de> References: <20170824231016.1843118-1-arnd@arndb.de> X-Provags-ID: V03:K0:rThUZ54Et99rKtlz/vDulbjODT2xuY2pnL5UetgvTm1r0abUWhe COZBsMxsr9qM0/vO6CGivvClZ7bTKIz9eVvs/HbZXSvayx6jvPLoB7yXkqAL3SNyyCjfJI0 cFnTPHT9+/oNjyBeber3X8MfzYtaGTLe2bZLBu8P3o+EzkHyYVyp7xlNlMdr4FwUaCIDxHw D3HPAwSSzpHPgXTabeIcw== X-UI-Out-Filterresults: notjunk:1; V01:K0:5ZkjGTjIebI=:g998s0mq2azb+oLb1chRni W1ckrzT8iGLuA/OjUKQIofuplUrMW0gW0+/21PuQKrbQLWM/9ogaTf82Dmem9jHBLYJ8w3jqD W8lIf1g0NUXGH22biQU7qi3nmmacYESfEb37AwvxzCEWIHFKmkHlrDK/phA5bJHwultCMum7d TgsGEIqwJAjc1bXDS+BxyF6/D0oUR2qIirJvdCr7bRaj5/ert1XMC4/F39BANe1HM1vHNb/H0 yhLDS+YhgqEY4tAgY2pXr8S2joAAGckG8URx1jE5o3zAUxizFseh1D7xj7a7UJXU2+qxtNBmZ pKWQIg7SoZSYrhsgzoeCKOS/CUS6GZIk3vE4UiDpw6pDW19QOBRLSoqBmKyOJGzXdmwKwdsTr k8y7/wpAiH7vjNfOetcVbFXCX3QgZn5X2CJ+mJf1hgADL84/v/In548vnfl9xiWVZEsJLj2ub k3N32PSq3abORUYxojew0a7JRiJ6bCjYVmedmQ17qvKpWMWwEpuskCqDWl+wCYzI0nZcKGVjj sW0WMDmYTHcvT/fSRa0IBKXF46gEm4SMO2uDrkvcjaKPAGZ5JnhqiBdBzQPDRSx6p5zRArAaR lo0oJ821nOvw1Ko3eKWFAgJnymTZoxRQikjX4w6I/nwhLJRoTsBEdKLeSdyCt0N0v2VGmDeB/ bZJsvhAyI05G0abnf+PEGqHqJhW6kbtZwXQ3UFsOSYz75KdGpUnrJhxIUlVWfyILZkUy03iFG cjwE+0UcwfDfun3AeCkOLSiECU4/Dfg3NXUY+g== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an interesting regression with gcc-8, showing a harmless warning for correct code: In file included from include/linux/kernel.h:13:0, ... from drivers/scsi/lpfc/lpfc_debugfs.c:23: include/linux/printk.h:301:2: error: 'eq' may be used uninitialized in this function [-Werror=maybe-uninitialized] printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__) ^~~~~~ In file included from drivers/scsi/lpfc/lpfc_debugfs.c:58:0: drivers/scsi/lpfc/lpfc_debugfs.h:451:31: note: 'eq' was declared here I managed to reduce the warning into a small test case for gcc-8 that I reported in the gcc bugzilla[1]. As a workaround, this changes the logic to move the two assignments of 'eq' out of the conditions and instead make the index conditional. This works for all configurations I tried and avoids adding a bogus initialization. Acked-by: James Smart Link: [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81958 Signed-off-by: Arnd Bergmann --- drivers/scsi/lpfc/lpfc_debugfs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.h b/drivers/scsi/lpfc/lpfc_debugfs.h index 7b7d314af0e0..c4edd87bfc65 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.h +++ b/drivers/scsi/lpfc/lpfc_debugfs.h @@ -478,16 +478,16 @@ lpfc_debug_dump_cq(struct lpfc_hba *phba, int qtype, int wqidx) return; for (eqidx = 0; eqidx < phba->io_channel_irqs; eqidx++) { - eq = phba->sli4_hba.hba_eq[eqidx]; - if (cq->assoc_qid == eq->queue_id) + if (cq->assoc_qid == phba->sli4_hba.hba_eq[eqidx]->queue_id) break; } if (eqidx == phba->io_channel_irqs) { pr_err("Couldn't find EQ for CQ. Using EQ[0]\n"); eqidx = 0; - eq = phba->sli4_hba.hba_eq[0]; } + eq = phba->sli4_hba.hba_eq[eqidx]; + if (qtype == DUMP_FCP || qtype == DUMP_NVME) pr_err("%s CQ: WQ[Idx:%d|Qid%d]->CQ[Idx%d|Qid%d]" "->EQ[Idx:%d|Qid:%d]:\n",