From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933675AbdCWOzi (ORCPT ); Thu, 23 Mar 2017 10:55:38 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:54383 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932420AbdCWOzg (ORCPT ); Thu, 23 Mar 2017 10:55:36 -0400 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] scsi: lpfc: fix building without debugfs support Date: Thu, 23 Mar 2017 15:53:45 +0100 Message-Id: <20170323145407.2811-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:59tirMq1bvTnEVnDgKPo1HYTlrq9I3xsqNxejXhED8yx4LLMsSm ieNkpCozbvvVTjGgcbw/yJSsZ06DMwEnqWH6mIN+N/NgTYHpX9a7E4kigvTRTWgsEWrPuN+ dMSy1EgGRy4wmMf2ylzptCHGBIZW4iLj0KFUpIO1AuJn9RkVN/vfFLMJKsKfCklHJoostXe BhYiQPb7TdzXOOl4H/Mtw== X-UI-Out-Filterresults: notjunk:1;V01:K0:y1rfk7eU82s=:IEn5FHuFDi1yx+jsPiGVk2 6sfFF2PjPargooQazdMkP6uXt7Vxk9vBMS0HZjyjzjSpUNajEFKhb2AvXgeCCXRkSLbgNskyL +X9d8Y0tS6VbnayaLJsysg+uTnLGiLSu+/4gJfHzWJYcMQkwgF2mAF2WMeyC/oIXF0S7i9CiH gySsLZKkUJ7/nlBtgCOcVbh8UKqPGWhiLwDHk7Cuu73ytJDzp5rOG9r4erlSC7mIL4YUTm35e YCt8CdL2PK3RtZjENt2Uzb27A6/bPUYFrr5a07ItL3mQ4xIcWjOMLfYSlDNMykSj+SFY2jNB7 iNGGoIKNqOqTN8EDn7Q1HMUqUtIL0Cx8yRzf4m832o0bdSlR+Gf/aaNkO2srD2LWfLrwF5fsh IQO/HFz7TQ58s0MCCR8zWGgHBeTKwEghCGGTWfkunCJpqc2K43hC4T3sPmSlfUaXCRzetQdfh E4EVR+KT7+VoZWHtUjhxqE0KIiozl2jZBuXg9o+SP6qcmXEBfMkuFVcLpRjZM0Mv6Rf/LQXw1 MmA/PRmV1bfFi4QX1qm5MPcm8OAqvF6QocAmEgFsbflHir7YT0sJbW3zFtr3te3wvUyRUwGZx eSuP/5njn7Na3WCODUycKAB0FYUVyKuON4hk0hYHIvqHNLeDRa9ZCKC0lRbJL7QBFlH1MUhDl ZCX9AfbWLGzsOr4fbPoST69hyLB3Fdg5d/W9AMrddHrKNoPUEquv+YtcLK5J/y7yuE6Q= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On a randconfig build without CONFIG_SCSI_LPFC_DEBUG_FS, I ran into multiple compile failures: drivers/scsi/lpfc/lpfc_debugfs.h: In function 'lpfc_debug_dump_wq': drivers/scsi/lpfc/lpfc_debugfs.h:405:15: error: 'DUMP_FCP' undeclared (first use in this function); did you mean 'DUMP_VAR'? drivers/scsi/lpfc/lpfc_debugfs.h:405:15: note: each undeclared identifier is reported only once for each function it appears in drivers/scsi/lpfc/lpfc_debugfs.h:408:22: error: 'DUMP_NVME' undeclared (first use in this function); did you mean 'DUMP_NONE'? drivers/scsi/lpfc/lpfc_nvmet.c: In function 'lpfc_nvmet_xmt_ls_rsp_cmp': drivers/scsi/lpfc/lpfc_nvmet.c:109:2: error: implicit declaration of function 'lpfc_nvmeio_data'; did you mean 'lpfc_mem_free'? [-Werror=implicit-function-declaration] drivers/scsi/lpfc/lpfc_nvmet.c: In function 'lpfc_nvmet_xmt_fcp_op': drivers/scsi/lpfc/lpfc_nvmet.c:523:10: error: unused variable 'id' [-Werror=unused-variable] They are all trivial to fix, so I'm doing it in a combined patch here. Fixes: 1d9d5a9879ad ("scsi: lpfc: refactor debugfs queue dump routines") Fixes: bd2cdd5e400f ("scsi: lpfc: NVME Initiator: Add debugfs support") Fixes: 2b65e18202fd ("scsi: lpfc: NVME Target: Add debugfs support") Signed-off-by: Arnd Bergmann --- drivers/scsi/lpfc/lpfc_debugfs.h | 22 ++++++++++++++-------- drivers/scsi/lpfc/lpfc_nvmet.c | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_debugfs.h b/drivers/scsi/lpfc/lpfc_debugfs.h index c05f56c3023f..7b7d314af0e0 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.h +++ b/drivers/scsi/lpfc/lpfc_debugfs.h @@ -44,14 +44,6 @@ /* hbqinfo output buffer size */ #define LPFC_HBQINFO_SIZE 8192 -enum { - DUMP_FCP, - DUMP_NVME, - DUMP_MBX, - DUMP_ELS, - DUMP_NVMELS, -}; - /* nvmestat output buffer size */ #define LPFC_NVMESTAT_SIZE 8192 #define LPFC_NVMEKTIME_SIZE 8192 @@ -283,8 +275,22 @@ struct lpfc_idiag { struct lpfc_idiag_offset offset; void *ptr_private; }; + +#else + +#define lpfc_nvmeio_data(phba, fmt, arg...) \ + no_printk(fmt, ##arg) + #endif +enum { + DUMP_FCP, + DUMP_NVME, + DUMP_MBX, + DUMP_ELS, + DUMP_NVMELS, +}; + /* Mask for discovery_trace */ #define LPFC_DISC_TRC_ELS_CMD 0x1 /* Trace ELS commands */ #define LPFC_DISC_TRC_ELS_RSP 0x2 /* Trace ELS response */ diff --git a/drivers/scsi/lpfc/lpfc_nvmet.c b/drivers/scsi/lpfc/lpfc_nvmet.c index 7ca868f394da..acba1b67e505 100644 --- a/drivers/scsi/lpfc/lpfc_nvmet.c +++ b/drivers/scsi/lpfc/lpfc_nvmet.c @@ -520,7 +520,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport, struct lpfc_hba *phba = ctxp->phba; struct lpfc_iocbq *nvmewqeq; unsigned long iflags; - int rc, id; + int rc; #ifdef CONFIG_SCSI_LPFC_DEBUG_FS if (phba->ktime_on) { @@ -530,7 +530,7 @@ lpfc_nvmet_xmt_fcp_op(struct nvmet_fc_target_port *tgtport, ctxp->ts_nvme_data = ktime_get_ns(); } if (phba->cpucheck_on & LPFC_CHECK_NVMET_IO) { - id = smp_processor_id(); + int id = smp_processor_id(); ctxp->cpu = id; if (id < LPFC_CHECK_CPU_CNT) phba->cpucheck_xmt_io[id]++; -- 2.9.0