scsi: lpfc: Move trunk_errmsg[] from a header file into a .c file

Arrays should be defined in .c files instead of in a header file. This
patch reduces the size of the lpfc kernel module.

Cc: James Smart <james.smart@broadcom.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Acked-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 7259cd0532bc7287cbf824d29d06a68f9d43c639..e9adb3f1961d86967c53d82c3149a0693ac4fbb0 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -71,6 +71,23 @@
 #define LPFC_REG_WRITE_KEY_SIZE        4
 #define LPFC_REG_WRITE_KEY     "EMLX"
 
+const char *const trunk_errmsg[] = {   /* map errcode */
+       "",     /* There is no such error code at index 0*/
+       "link negotiated speed does not match existing"
+               " trunk - link was \"low\" speed",
+       "link negotiated speed does not match"
+               " existing trunk - link was \"middle\" speed",
+       "link negotiated speed does not match existing"
+               " trunk - link was \"high\" speed",
+       "Attached to non-trunking port - F_Port",
+       "Attached to non-trunking port - N_Port",
+       "FLOGI response timeout",
+       "non-FLOGI frame received",
+       "Invalid FLOGI response",
+       "Trunking initialization protocol",
+       "Trunk peer device mismatch",
+};
+
 /**
  * lpfc_jedec_to_ascii - Hex to ascii convertor according to JEDEC rules
  * @incr: integer to convert.

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 3b5988669b54baf33f3c7b5bfd0bce18b900b2cd..77f9a55a3f54422549bfb89945f9988930c26a09 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -4084,22 +4084,7 @@ struct lpfc_acqe_grp5 {
        uint32_t trailer;
 };
 
-static char *const trunk_errmsg[] = {  /* map errcode */
-       "",     /* There is no such error code at index 0*/
-       "link negotiated speed does not match existing"
-               " trunk - link was \"low\" speed",
-       "link negotiated speed does not match"
-               " existing trunk - link was \"middle\" speed",
-       "link negotiated speed does not match existing"
-               " trunk - link was \"high\" speed",
-       "Attached to non-trunking port - F_Port",
-       "Attached to non-trunking port - N_Port",
-       "FLOGI response timeout",
-       "non-FLOGI frame received",
-       "Invalid FLOGI response",
-       "Trunking initialization protocol",
-       "Trunk peer device mismatch",
-};
+extern const char *const trunk_errmsg[];
 
 struct lpfc_acqe_fc_la {
        uint32_t word0;