diff mbox series

[47/59] qla2xxx: Modify NVMe include directives

Message ID	20190801175614.73655-48-bvanassche@acm.org (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-scsi-owner@kernel.org> From: Bart Van Assche <bvanassche@acm.org> To: "Martin K . Petersen" <martin.petersen@oracle.com>, "James E . J . Bottomley" <jejb@linux.vnet.ibm.com> Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>, Himanshu Madhani <hmadhani@marvell.com>, Giridhar Malavali <gmalavali@marvell.com> Subject: [PATCH 47/59] qla2xxx: Modify NVMe include directives Date: Thu, 1 Aug 2019 10:56:02 -0700 Message-Id: <20190801175614.73655-48-bvanassche@acm.org> In-Reply-To: <20190801175614.73655-1-bvanassche@acm.org> References: <20190801175614.73655-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk
Series	qla2xxx patches for kernel v5.4 \| expand [00/59] qla2xxx patches for kernel v5.4 [01/59] qla2xxx: Make qla2x00_abort_srb() again decrease the sp reference count [02/59] qla2xxx: Really fix qla2xxx_eh_abort() [03/59] qla2xxx: Improve Linux kernel coding style conformance [04/59] qla2xxx: Use tabs instead of spaces for indentation [05/59] qla2xxx: Include the <asm/unaligned.h> header file from qla_dsd.h [06/59] qla2xxx: Remove an include directive from qla_mr.c [07/59] qla2xxx: Remove a superfluous forward declaration [08/59] qla2xxx: Declare the fourth ql_dump_buffer() argument const [09/59] qla2xxx: Change the return type of qla2x00_update_ms_fdmi_iocb() into void [10/59] qla2xxx: Reduce the scope of three local variables in qla2xxx_queuecommand() [11/59] qla2xxx: Declare qla_tgt_cmd.cdb const [12/59] qla2xxx: Change data_dsd into an array [13/59] qla2xxx: Verify locking assumptions at runtime [14/59] qla2xxx: Reduce the number of casts in GID list code [15/59] qla2xxx: Simplify qlt_lport_dump() [16/59] qla2xxx: Remove a superfluous pointer check [17/59] qla2xxx: Remove two superfluous tests [18/59] qla2xxx: Simplify qla24xx_abort_sp_done() [19/59] qla2xxx: Fix session lookup in qlt_abort_work() [20/59] qla2xxx: Report the firmware status code if a mailbox command fails [21/59] qla2xxx: Do not corrupt vha->plogi_ack_list [22/59] qla2xxx: Use strlcpy() instead of strncpy() [23/59] qla2xxx: Complain if a mailbox command times out [24/59] qla2xxx: Complain if parsing the version string fails [25/59] qla2xxx: Remove dead code [26/59] qla2xxx: Simplify a debug statement [27/59] qla2xxx: Fix qla24xx_process_bidir_cmd() [28/59] qla2xxx: Remove unreachable code from qla83xx_idc_lock() [29/59] qla2xxx: Suppress a Coveritiy complaint about integer overflow [30/59] qla2xxx: Suppress multiple Coverity complaint about out-of-bounds accesses [31/59] qla2xxx: Always check the qla2x00_wait_for_hba_online() return value [32/59] qla2xxx: Declare fourth qla2x00_set_model_info() argument const [33/59] qla2xxx: Complain if waiting for pending commands times out [34/59] qla2xxx: Check the PCI info string output buffer size [35/59] qla2xxx: Use memcpy() and strlcpy() instead of strcpy() and strncpy() [36/59] qla2xxx: Complain if a soft reset fails [37/59] qla2xxx: Introduce the be_id_t and le_id_t data types for FC src/dst IDs [38/59] qla2xxx: Change the return type of qla24xx_read_flash_data() [39/59] qla2xxx: Check secondary image if reading the primary image fails [40/59] qla2xxx: Make it explicit that ELS pass-through IOCBs use little endian [41/59] qla2xxx: Set the responder mode if appropriate for ELS pass-through IOCBs [42/59] qla2xxx: Rework key encoding in qlt_find_host_by_d_id() [43/59] qla2xxx: Enable type checking for the SRB free and done callback functions [44/59] qla2xxx: Introduce the function qla2xxx_init_sp() [45/59] qla2xxx: Fix a race condition between aborting and completing a SCSI command [46/59] qla2xxx: Make qlt_handle_abts_completion() more robust [47/59] qla2xxx: Modify NVMe include directives [48/59] qla2xxx: Rename qla24xx_async_abort_command() into qla24xx_sync_abort_command() [49/59] qla2xxx: Introduce qla2xxx_get_next_handle() [50/59] qla2xxx: Make sure that aborted commands are freed [51/59] qla2xxx: Complain if sp->done() is not called from the completion path [52/59] qla2xxx: Let the compiler check the type of the SCSI command context pointer [53/59] qla2xxx: Remove superfluous sts_entry_* casts [54/59] qla2xxx: Report invalid mailbox status codes [55/59] qla2xxx: Inline the qla2x00_fcport_event_handler() function [56/59] qla2xxx: Introduce qla2x00_els_dcmd2_free() [57/59] qla2xxx: Remove two superfluous if-tests [58/59] qla2xxx: Simplify qla24xx_async_abort_cmd() [59/59] qla2xxx: Fix a NULL pointer dereference

Commit Message

Bart Van Assche Aug. 1, 2019, 5:56 p.m. UTC

Since struct sg_table is used in nvme-fc-driver.h, include
<linux/scatterlist.h> from that header file.

Since no definitions or declarations from <linux/blk-mq.h> are used in
the qla_nvme.h header file, do not include <linux/blk-mq.h> from that
header file.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/scsi/qla2xxx/qla_nvme.h | 1 -
 include/linux/nvme-fc-driver.h  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_nvme.h b/drivers/scsi/qla2xxx/qla_nvme.h
index 25a2b82d5095..ef912902d4e5 100644
--- a/drivers/scsi/qla2xxx/qla_nvme.h
+++ b/drivers/scsi/qla2xxx/qla_nvme.h
@@ -7,7 +7,6 @@ 
 #ifndef __QLA_NVME_H
 #define __QLA_NVME_H
 
-#include <linux/blk-mq.h>
 #include <uapi/scsi/fc/fc_fs.h>
 #include <uapi/scsi/fc/fc_els.h>
 #include <linux/nvme-fc-driver.h>
diff --git a/include/linux/nvme-fc-driver.h b/include/linux/nvme-fc-driver.h
index 98d904961b33..10f81629b9ce 100644
--- a/include/linux/nvme-fc-driver.h
+++ b/include/linux/nvme-fc-driver.h
@@ -6,6 +6,8 @@ 
 #ifndef _NVME_FC_DRIVER_H
 #define _NVME_FC_DRIVER_H 1
 
+#include <linux/scatterlist.h>
+
 
 /*
  * **********************  LLDD FC-NVME Host API ********************