|
 |
3c6e85 |
From f089e13f8bf95cf42f6a3a0591a75d04dbcf6f6b Mon Sep 17 00:00:00 2001
|
|
|
3c6e85 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Date: Thu, 1 Aug 2019 15:55:31 -0400
|
|
|
3c6e85 |
Subject: [PATCH 071/124] [scsi] scsi: qla2xxx: Move the
|
|
|
3c6e85 |
port_state_strdefinition from a .h to a .c file
|
|
|
3c6e85 |
|
|
|
3c6e85 |
Message-id: <20190801155618.12650-72-hmadhani@redhat.com>
|
|
|
3c6e85 |
Patchwork-id: 267855
|
|
|
3c6e85 |
O-Subject: [RHEL 7.8 e-stor PATCH 071/118] scsi: qla2xxx: Move the port_state_str[] definition from a .h to a .c file
|
|
|
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 |
Reduce the size of the qla2xxx kernel module by moving an array definition
|
|
|
3c6e85 |
from a .h into a .c file.
|
|
|
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 c4dc7cd314398f03c1c6e5034b8913aeb40b2646)
|
|
|
3c6e85 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3c6e85 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3c6e85 |
---
|
|
|
3c6e85 |
drivers/scsi/qla2xxx/qla_def.h | 8 +-------
|
|
|
3c6e85 |
drivers/scsi/qla2xxx/qla_isr.c | 8 ++++++++
|
|
|
3c6e85 |
2 files changed, 9 insertions(+), 7 deletions(-)
|
|
|
3c6e85 |
|
|
|
3c6e85 |
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
|
|
|
3c6e85 |
index 1cc48efc43d2..8ad107855ea1 100644
|
|
|
3c6e85 |
--- a/drivers/scsi/qla2xxx/qla_def.h
|
|
|
3c6e85 |
+++ b/drivers/scsi/qla2xxx/qla_def.h
|
|
|
3c6e85 |
@@ -2478,13 +2478,7 @@ struct event_arg {
|
|
|
3c6e85 |
#define FCS_DEVICE_LOST 3
|
|
|
3c6e85 |
#define FCS_ONLINE 4
|
|
|
3c6e85 |
|
|
|
3c6e85 |
-static const char * const port_state_str[] = {
|
|
|
3c6e85 |
- "Unknown",
|
|
|
3c6e85 |
- "UNCONFIGURED",
|
|
|
3c6e85 |
- "DEAD",
|
|
|
3c6e85 |
- "LOST",
|
|
|
3c6e85 |
- "ONLINE"
|
|
|
3c6e85 |
-};
|
|
|
3c6e85 |
+extern const char *const port_state_str[5];
|
|
|
3c6e85 |
|
|
|
3c6e85 |
/*
|
|
|
3c6e85 |
* FC port flags.
|
|
|
3c6e85 |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
|
|
|
3c6e85 |
index 32e5793e6864..f099a812e29f 100644
|
|
|
3c6e85 |
--- a/drivers/scsi/qla2xxx/qla_isr.c
|
|
|
3c6e85 |
+++ b/drivers/scsi/qla2xxx/qla_isr.c
|
|
|
3c6e85 |
@@ -22,6 +22,14 @@ static void qla2x00_status_cont_entry(struct rsp_que *, sts_cont_entry_t *);
|
|
|
3c6e85 |
static int qla2x00_error_entry(scsi_qla_host_t *, struct rsp_que *,
|
|
|
3c6e85 |
sts_entry_t *);
|
|
|
3c6e85 |
|
|
|
3c6e85 |
+const char *const port_state_str[] = {
|
|
|
3c6e85 |
+ "Unknown",
|
|
|
3c6e85 |
+ "UNCONFIGURED",
|
|
|
3c6e85 |
+ "DEAD",
|
|
|
3c6e85 |
+ "LOST",
|
|
|
3c6e85 |
+ "ONLINE"
|
|
|
3c6e85 |
+};
|
|
|
3c6e85 |
+
|
|
|
3c6e85 |
/**
|
|
|
3c6e85 |
* qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200.
|
|
|
3c6e85 |
* @irq: interrupt number
|
|
|
3c6e85 |
--
|
|
|
3c6e85 |
2.13.6
|
|
|
3c6e85 |
|