scsi: smartpqi: Update event handler

Change the data types for event_id and additional_event_id.

Link: https://lore.kernel.org/r/161549378628.25025.14338046567871170916.stgit@brunhilda
Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: Scott Teel <scott.teel@microchip.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microchip.com>
Signed-off-by: Don Brace <don.brace@microchip.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi.h b/drivers/scsi/smartpqi/smartpqi.h
index a579d77..a18c1f9 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi.h
+++ b/drivers/scsi/smartpqi/smartpqi.h
@@ -1217,8 +1217,8 @@ struct pqi_io_request {
 struct pqi_event {
        bool    pending;
        u8      event_type;
-       __le16  event_id;
-       __le32  additional_event_id;
+       u16     event_id;
+       u32     additional_event_id;
        __le32  ofa_bytes_requested;
        __le16  ofa_cancel_reason;
 };

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index a226b7e..4c09628 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -3247,8 +3247,8 @@ static void pqi_acknowledge_event(struct pqi_ctrl_info *ctrl_info,
        put_unaligned_le16(sizeof(request) - PQI_REQUEST_HEADER_LENGTH,
                &request.header.iu_length);
        request.event_type = event->event_type;
-       request.event_id = event->event_id;
-       request.additional_event_id = event->additional_event_id;
+       put_unaligned_le16(event->event_id, &request.event_id);
+       put_unaligned_le32(event->additional_event_id, &request.additional_event_id);
 
        pqi_send_event_ack(ctrl_info, &request, sizeof(request));
 }
@@ -3512,8 +3512,9 @@ static int pqi_process_event_intr(struct pqi_ctrl_info *ctrl_info)
                        event = &ctrl_info->events[event_index];
                        event->pending = true;
                        event->event_type = response->event_type;
-                       event->event_id = response->event_id;
-                       event->additional_event_id = response->additional_event_id;
+                       event->event_id = get_unaligned_le16(&response->event_id);
+                       event->additional_event_id =
+                               get_unaligned_le32(&response->additional_event_id);
                        if (event->event_type == PQI_EVENT_TYPE_OFA)
                                pqi_ofa_capture_event_payload(event, response);
                }