scsi: mpt3sas: Fix typo of "TRIGGER"

Change "TIGGER" to "TRIGGER" in struct names and typedefs.

Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: James Seo <james@equiv.tech>
Link: https://lore.kernel.org/r/20230806170604.16143-11-james@equiv.tech
Tested-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 8c38d6884d88680ad2cd515b9832d9aff026a34b..f83f9297e9fb5f4f0dbb115da2565c65ae200a29 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -5043,7 +5043,7 @@ _base_get_event_diag_triggers(struct MPT3SAS_ADAPTER *ioc)
 {
        Mpi26DriverTriggerPage2_t trigger_pg2;
        struct SL_WH_EVENT_TRIGGER_T *event_tg;
-       MPI26_DRIVER_MPI_EVENT_TIGGER_ENTRY *mpi_event_tg;
+       MPI26_DRIVER_MPI_EVENT_TRIGGER_ENTRY *mpi_event_tg;
        Mpi2ConfigReply_t mpi_reply;
        int r = 0, i = 0;
        u16 count = 0;
@@ -5095,7 +5095,7 @@ _base_get_scsi_diag_triggers(struct MPT3SAS_ADAPTER *ioc)
 {
        Mpi26DriverTriggerPage3_t trigger_pg3;
        struct SL_WH_SCSI_TRIGGER_T *scsi_tg;
-       MPI26_DRIVER_SCSI_SENSE_TIGGER_ENTRY *mpi_scsi_tg;
+       MPI26_DRIVER_SCSI_SENSE_TRIGGER_ENTRY *mpi_scsi_tg;
        Mpi2ConfigReply_t mpi_reply;
        int r = 0, i = 0;
        u16 count = 0;
@@ -5147,7 +5147,7 @@ _base_get_mpi_diag_triggers(struct MPT3SAS_ADAPTER *ioc)
 {
        Mpi26DriverTriggerPage4_t trigger_pg4;
        struct SL_WH_MPI_TRIGGER_T *status_tg;
-       MPI26_DRIVER_IOCSTATUS_LOGINFO_TIGGER_ENTRY *mpi_status_tg;
+       MPI26_DRIVER_IOCSTATUS_LOGINFO_TRIGGER_ENTRY *mpi_status_tg;
        Mpi2ConfigReply_t mpi_reply;
        int r = 0, i = 0;
        u16 count = 0;

diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
index d114ef381c4451d788387ea8c5e79a8536431683..2e88f456fc347120de638b30a345abc234c896f6 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_config.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
@@ -2334,7 +2334,7 @@ mpt3sas_config_update_driver_trigger_pg2(struct MPT3SAS_ADAPTER *ioc,
                tg_pg2.NumMPIEventTrigger = 0;
                memset(&tg_pg2.MPIEventTriggers[0], 0,
                    NUM_VALID_ENTRIES * sizeof(
-                   MPI26_DRIVER_MPI_EVENT_TIGGER_ENTRY));
+                   MPI26_DRIVER_MPI_EVENT_TRIGGER_ENTRY));
        }
 
        rc = _config_set_driver_trigger_pg2(ioc, &mpi_reply, &tg_pg2);
@@ -2493,7 +2493,7 @@ mpt3sas_config_update_driver_trigger_pg3(struct MPT3SAS_ADAPTER *ioc,
                tg_pg3.NumSCSISenseTrigger = 0;
                memset(&tg_pg3.SCSISenseTriggers[0], 0,
                    NUM_VALID_ENTRIES * sizeof(
-                   MPI26_DRIVER_SCSI_SENSE_TIGGER_ENTRY));
+                   MPI26_DRIVER_SCSI_SENSE_TRIGGER_ENTRY));
        }
 
        rc = _config_set_driver_trigger_pg3(ioc, &mpi_reply, &tg_pg3);
@@ -2649,7 +2649,7 @@ mpt3sas_config_update_driver_trigger_pg4(struct MPT3SAS_ADAPTER *ioc,
                tg_pg4.NumIOCStatusLogInfoTrigger = 0;
                memset(&tg_pg4.IOCStatusLoginfoTriggers[0], 0,
                    NUM_VALID_ENTRIES * sizeof(
-                   MPI26_DRIVER_IOCSTATUS_LOGINFO_TIGGER_ENTRY));
+                   MPI26_DRIVER_IOCSTATUS_LOGINFO_TRIGGER_ENTRY));
        }
 
        rc = _config_set_driver_trigger_pg4(ioc, &mpi_reply, &tg_pg4);

diff --git a/drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h b/drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h
index 5f3328f011a28772b324e889aedd9b994747e134..edb8fe709089fded0b946cc8aebebf1a60ec193f 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_trigger_pages.h
@@ -20,12 +20,12 @@
 
 #define MPI2_CONFIG_EXTPAGETYPE_DRIVER_PERSISTENT_TRIGGER    (0xE0)
 #define MPI26_DRIVER_TRIGGER_PAGE0_PAGEVERSION               (0x01)
-typedef struct _MPI26_CONFIG_PAGE_DRIVER_TIGGER_0 {
+typedef struct _MPI26_CONFIG_PAGE_DRIVER_TRIGGER_0 {
        MPI2_CONFIG_EXTENDED_PAGE_HEADER        Header; /* 0x00  */
        U16     TriggerFlags;           /* 0x08  */
        U16     Reserved0xA;            /* 0x0A */
        U32     Reserved0xC[61];        /* 0x0C */
-} _MPI26_CONFIG_PAGE_DRIVER_TIGGER_0, Mpi26DriverTriggerPage0_t;
+} _MPI26_CONFIG_PAGE_DRIVER_TRIGGER_0, Mpi26DriverTriggerPage0_t;
 
 /* Trigger Flags */
 #define  MPI26_DRIVER_TRIGGER0_FLAG_MASTER_TRIGGER_VALID       (0x0001)
@@ -34,61 +34,61 @@ typedef struct _MPI26_CONFIG_PAGE_DRIVER_TIGGER_0 {
 #define  MPI26_DRIVER_TRIGGER0_FLAG_LOGINFO_TRIGGER_VALID      (0x0008)
 
 #define MPI26_DRIVER_TRIGGER_PAGE1_PAGEVERSION               (0x01)
-typedef struct _MPI26_DRIVER_MASTER_TIGGER_ENTRY {
+typedef struct _MPI26_DRIVER_MASTER_TRIGGER_ENTRY {
        U32     MasterTriggerFlags;
-} MPI26_DRIVER_MASTER_TIGGER_ENTRY;
+} MPI26_DRIVER_MASTER_TRIGGER_ENTRY;
 
 #define MPI26_MAX_MASTER_TRIGGERS                                   (1)
-typedef struct _MPI26_CONFIG_PAGE_DRIVER_TIGGER_1 {
+typedef struct _MPI26_CONFIG_PAGE_DRIVER_TRIGGER_1 {
        MPI2_CONFIG_EXTENDED_PAGE_HEADER        Header; /* 0x00 */
        U16     NumMasterTrigger;       /* 0x08 */
        U16     Reserved0xA;            /* 0x0A */
-       MPI26_DRIVER_MASTER_TIGGER_ENTRY MasterTriggers[MPI26_MAX_MASTER_TRIGGERS];     /* 0x0C */
-} MPI26_CONFIG_PAGE_DRIVER_TIGGER_1, Mpi26DriverTriggerPage1_t;
+       MPI26_DRIVER_MASTER_TRIGGER_ENTRY MasterTriggers[MPI26_MAX_MASTER_TRIGGERS];    /* 0x0C */
+} MPI26_CONFIG_PAGE_DRIVER_TRIGGER_1, Mpi26DriverTriggerPage1_t;
 
 #define MPI26_DRIVER_TRIGGER_PAGE2_PAGEVERSION               (0x01)
-typedef struct _MPI26_DRIVER_MPI_EVENT_TIGGER_ENTRY {
+typedef struct _MPI26_DRIVER_MPI_EVENT_TRIGGER_ENTRY {
        U16     MPIEventCode;           /* 0x00 */
        U16     MPIEventCodeSpecific;   /* 0x02 */
-} MPI26_DRIVER_MPI_EVENT_TIGGER_ENTRY;
+} MPI26_DRIVER_MPI_EVENT_TRIGGER_ENTRY;
 
 #define MPI26_MAX_MPI_EVENT_TRIGGERS                            (20)
-typedef struct _MPI26_CONFIG_PAGE_DRIVER_TIGGER_2 {
+typedef struct _MPI26_CONFIG_PAGE_DRIVER_TRIGGER_2 {
        MPI2_CONFIG_EXTENDED_PAGE_HEADER        Header; /* 0x00  */
        U16     NumMPIEventTrigger;     /* 0x08  */
        U16     Reserved0xA;            /* 0x0A */
-       MPI26_DRIVER_MPI_EVENT_TIGGER_ENTRY MPIEventTriggers[MPI26_MAX_MPI_EVENT_TRIGGERS]; /* 0x0C */
-} MPI26_CONFIG_PAGE_DRIVER_TIGGER_2, Mpi26DriverTriggerPage2_t;
+       MPI26_DRIVER_MPI_EVENT_TRIGGER_ENTRY MPIEventTriggers[MPI26_MAX_MPI_EVENT_TRIGGERS]; /* 0x0C */
+} MPI26_CONFIG_PAGE_DRIVER_TRIGGER_2, Mpi26DriverTriggerPage2_t;
 
 #define MPI26_DRIVER_TRIGGER_PAGE3_PAGEVERSION               (0x01)
-typedef struct _MPI26_DRIVER_SCSI_SENSE_TIGGER_ENTRY {
+typedef struct _MPI26_DRIVER_SCSI_SENSE_TRIGGER_ENTRY {
        U8     ASCQ;            /* 0x00 */
        U8     ASC;             /* 0x01 */
        U8     SenseKey;        /* 0x02 */
        U8     Reserved;        /* 0x03 */
-} MPI26_DRIVER_SCSI_SENSE_TIGGER_ENTRY;
+} MPI26_DRIVER_SCSI_SENSE_TRIGGER_ENTRY;
 
 #define MPI26_MAX_SCSI_SENSE_TRIGGERS                            (20)
-typedef struct _MPI26_CONFIG_PAGE_DRIVER_TIGGER_3 {
+typedef struct _MPI26_CONFIG_PAGE_DRIVER_TRIGGER_3 {
        MPI2_CONFIG_EXTENDED_PAGE_HEADER        Header; /* 0x00  */
        U16     NumSCSISenseTrigger;                    /* 0x08  */
        U16     Reserved0xA;                            /* 0x0A */
-       MPI26_DRIVER_SCSI_SENSE_TIGGER_ENTRY SCSISenseTriggers[MPI26_MAX_SCSI_SENSE_TRIGGERS];  /* 0x0C */
-} MPI26_CONFIG_PAGE_DRIVER_TIGGER_3, Mpi26DriverTriggerPage3_t;
+       MPI26_DRIVER_SCSI_SENSE_TRIGGER_ENTRY SCSISenseTriggers[MPI26_MAX_SCSI_SENSE_TRIGGERS]; /* 0x0C */
+} MPI26_CONFIG_PAGE_DRIVER_TRIGGER_3, Mpi26DriverTriggerPage3_t;
 
 #define MPI26_DRIVER_TRIGGER_PAGE4_PAGEVERSION               (0x01)
-typedef struct _MPI26_DRIVER_IOCSTATUS_LOGINFO_TIGGER_ENTRY {
+typedef struct _MPI26_DRIVER_IOCSTATUS_LOGINFO_TRIGGER_ENTRY {
        U16        IOCStatus;      /* 0x00 */
        U16        Reserved;       /* 0x02 */
        U32        LogInfo;        /* 0x04 */
-} MPI26_DRIVER_IOCSTATUS_LOGINFO_TIGGER_ENTRY;
+} MPI26_DRIVER_IOCSTATUS_LOGINFO_TRIGGER_ENTRY;
 
 #define MPI26_MAX_LOGINFO_TRIGGERS                            (20)
-typedef struct _MPI26_CONFIG_PAGE_DRIVER_TIGGER_4 {
+typedef struct _MPI26_CONFIG_PAGE_DRIVER_TRIGGER_4 {
        MPI2_CONFIG_EXTENDED_PAGE_HEADER        Header; /* 0x00  */
        U16     NumIOCStatusLogInfoTrigger;             /* 0x08  */
        U16     Reserved0xA;                            /* 0x0A */
-       MPI26_DRIVER_IOCSTATUS_LOGINFO_TIGGER_ENTRY IOCStatusLoginfoTriggers[MPI26_MAX_LOGINFO_TRIGGERS];       /* 0x0C */
-} MPI26_CONFIG_PAGE_DRIVER_TIGGER_4, Mpi26DriverTriggerPage4_t;
+       MPI26_DRIVER_IOCSTATUS_LOGINFO_TRIGGER_ENTRY IOCStatusLoginfoTriggers[MPI26_MAX_LOGINFO_TRIGGERS];      /* 0x0C */
+} MPI26_CONFIG_PAGE_DRIVER_TRIGGER_4, Mpi26DriverTriggerPage4_t;
 
 #endif