|
 |
3c6e85 |
From a8640485122eaaa9108ada9d89e9843437611ee6 Mon Sep 17 00:00:00 2001
|
|
|
3c6e85 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Date: Thu, 1 Aug 2019 15:55:32 -0400
|
|
|
3c6e85 |
Subject: [PATCH 072/124] [scsi] scsi: qla2xxx: Declare
|
|
|
3c6e85 |
qla24xx_build_scsi_crc_2_iocbs() static
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Message-id: <20190801155618.12650-73-hmadhani@redhat.com>
|
|
|
3c6e85 |
Patchwork-id: 267846
|
|
|
3c6e85 |
O-Subject: [RHEL 7.8 e-stor PATCH 072/118] scsi: qla2xxx: Declare qla24xx_build_scsi_crc_2_iocbs() static
|
|
|
3c6e85 |
Bugzilla: 1729270
|
|
|
3c6e85 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3c6e85 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3c6e85 |
|
|
|
3c6e85 |
From: Bart Van Assche <bvanassche@acm.org>
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Bugzilla 1729270
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Since qla24xx_build_scsi_crc_2_iocbs() is only used inside a single source
|
|
|
3c6e85 |
file, declare this function static.
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Cc: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3c6e85 |
Cc: Giridhar Malavali <gmalavali@marvell.com>
|
|
|
3c6e85 |
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
|
|
|
3c6e85 |
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3c6e85 |
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
|
|
|
3c6e85 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3c6e85 |
(cherry picked from commit c20605edb38a1201d56ec83696b0b7a692a9f157)
|
|
|
3c6e85 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3c6e85 |
---
|
|
|
3c6e85 |
drivers/scsi/qla2xxx/qla_gbl.h | 2 --
|
|
|
3c6e85 |
drivers/scsi/qla2xxx/qla_iocb.c | 2 +-
|
|
|
3c6e85 |
2 files changed, 1 insertion(+), 3 deletions(-)
|
|
|
3c6e85 |
|
|
|
3c6e85 |
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
|
|
|
3c6e85 |
index 0f6a62f1a576..7254b5d8fbc1 100644
|
|
|
3c6e85 |
--- a/drivers/scsi/qla2xxx/qla_gbl.h
|
|
|
3c6e85 |
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
|
|
|
3c6e85 |
@@ -293,8 +293,6 @@ extern int qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *, srb_t *,
|
|
|
3c6e85 |
uint32_t *, uint16_t, struct qla_tgt_cmd *);
|
|
|
3c6e85 |
extern int qla24xx_get_one_block_sg(uint32_t, struct qla2_sgx *, uint32_t *);
|
|
|
3c6e85 |
extern int qla24xx_configure_prot_mode(srb_t *, uint16_t *);
|
|
|
3c6e85 |
-extern int qla24xx_build_scsi_crc_2_iocbs(srb_t *,
|
|
|
3c6e85 |
- struct cmd_type_crc_2 *, uint16_t, uint16_t, uint16_t);
|
|
|
3c6e85 |
|
|
|
3c6e85 |
/*
|
|
|
3c6e85 |
* Global Function Prototypes in qla_mbx.c source file.
|
|
|
3c6e85 |
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
|
|
|
3c6e85 |
index cb1d0067bc3d..7f0b3dd5d815 100644
|
|
|
3c6e85 |
--- a/drivers/scsi/qla2xxx/qla_iocb.c
|
|
|
3c6e85 |
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
|
|
|
3c6e85 |
@@ -1411,7 +1411,7 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,
|
|
|
3c6e85 |
* @tot_prot_dsds: Total number of segments with protection information
|
|
|
3c6e85 |
* @fw_prot_opts: Protection options to be passed to firmware
|
|
|
3c6e85 |
*/
|
|
|
3c6e85 |
-inline int
|
|
|
3c6e85 |
+static inline int
|
|
|
3c6e85 |
qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
|
|
|
3c6e85 |
uint16_t tot_dsds, uint16_t tot_prot_dsds, uint16_t fw_prot_opts)
|
|
|
3c6e85 |
{
|
|
|
3c6e85 |
--
|
|
|
3c6e85 |
2.13.6
|
|
|
3c6e85 |
|