hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/message/fusion/mptsas.c
....@@ -129,7 +129,7 @@
129129 static void mptsas_send_expander_event(struct fw_event_work *fw_event);
130130 static void mptsas_not_responding_devices(MPT_ADAPTER *ioc);
131131 static void mptsas_scan_sas_topology(MPT_ADAPTER *ioc);
132
-static void mptsas_broadcast_primative_work(struct fw_event_work *fw_event);
132
+static void mptsas_broadcast_primitive_work(struct fw_event_work *fw_event);
133133 static void mptsas_handle_queue_full_event(struct fw_event_work *fw_event);
134134 static void mptsas_volume_delete(MPT_ADAPTER *ioc, u8 id);
135135 void mptsas_schedule_target_reset(void *ioc);
....@@ -1665,7 +1665,7 @@
16651665 mptsas_free_fw_event(ioc, fw_event);
16661666 break;
16671667 case MPI_EVENT_SAS_BROADCAST_PRIMITIVE:
1668
- mptsas_broadcast_primative_work(fw_event);
1668
+ mptsas_broadcast_primitive_work(fw_event);
16691669 break;
16701670 case MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE:
16711671 mptsas_send_expander_event(fw_event);
....@@ -1992,7 +1992,6 @@
19921992 .sg_tablesize = MPT_SCSI_SG_DEPTH,
19931993 .max_sectors = 8192,
19941994 .cmd_per_lun = 7,
1995
- .use_clustering = ENABLE_CLUSTERING,
19961995 .shost_attrs = mptscsih_host_attrs,
19971996 .no_write_same = 1,
19981997 };
....@@ -2929,27 +2928,27 @@
29292928 if (ioc->sas_mgmt.status & MPT_MGMT_STATUS_RF_VALID) {
29302929 u8 *tmp;
29312930
2932
- smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;
2933
- if (le16_to_cpu(smprep->ResponseDataLength) !=
2934
- sizeof(struct rep_manu_reply))
2931
+ smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;
2932
+ if (le16_to_cpu(smprep->ResponseDataLength) !=
2933
+ sizeof(struct rep_manu_reply))
29352934 goto out_free;
29362935
2937
- manufacture_reply = data_out + sizeof(struct rep_manu_request);
2938
- strncpy(edev->vendor_id, manufacture_reply->vendor_id,
2939
- SAS_EXPANDER_VENDOR_ID_LEN);
2940
- strncpy(edev->product_id, manufacture_reply->product_id,
2941
- SAS_EXPANDER_PRODUCT_ID_LEN);
2942
- strncpy(edev->product_rev, manufacture_reply->product_rev,
2943
- SAS_EXPANDER_PRODUCT_REV_LEN);
2944
- edev->level = manufacture_reply->sas_format;
2945
- if (manufacture_reply->sas_format) {
2946
- strncpy(edev->component_vendor_id,
2947
- manufacture_reply->component_vendor_id,
2936
+ manufacture_reply = data_out + sizeof(struct rep_manu_request);
2937
+ strncpy(edev->vendor_id, manufacture_reply->vendor_id,
2938
+ SAS_EXPANDER_VENDOR_ID_LEN);
2939
+ strncpy(edev->product_id, manufacture_reply->product_id,
2940
+ SAS_EXPANDER_PRODUCT_ID_LEN);
2941
+ strncpy(edev->product_rev, manufacture_reply->product_rev,
2942
+ SAS_EXPANDER_PRODUCT_REV_LEN);
2943
+ edev->level = manufacture_reply->sas_format;
2944
+ if (manufacture_reply->sas_format) {
2945
+ strncpy(edev->component_vendor_id,
2946
+ manufacture_reply->component_vendor_id,
29482947 SAS_EXPANDER_COMPONENT_VENDOR_ID_LEN);
2949
- tmp = (u8 *)&manufacture_reply->component_id;
2950
- edev->component_id = tmp[0] << 8 | tmp[1];
2951
- edev->component_revision_id =
2952
- manufacture_reply->component_revision_id;
2948
+ tmp = (u8 *)&manufacture_reply->component_id;
2949
+ edev->component_id = tmp[0] << 8 | tmp[1];
2950
+ edev->component_revision_id =
2951
+ manufacture_reply->component_revision_id;
29532952 }
29542953 } else {
29552954 printk(MYIOC_s_ERR_FMT
....@@ -4327,7 +4326,7 @@
43274326 }
43284327 }
43294328 mpt_findImVolumes(ioc);
4330
- /* fall through */
4329
+ fallthrough;
43314330
43324331 case MPTSAS_ADD_DEVICE:
43334332 memset(&sas_device, 0, sizeof(struct mptsas_devinfo));
....@@ -4826,13 +4825,13 @@
48264825 }
48274826
48284827 /**
4829
- * mptsas_broadcast_primative_work - Handle broadcast primitives
4828
+ * mptsas_broadcast_primitive_work - Handle broadcast primitives
48304829 * @work: work queue payload containing info describing the event
48314830 *
48324831 * this will be handled in workqueue context.
48334832 */
48344833 static void
4835
-mptsas_broadcast_primative_work(struct fw_event_work *fw_event)
4834
+mptsas_broadcast_primitive_work(struct fw_event_work *fw_event)
48364835 {
48374836 MPT_ADAPTER *ioc = fw_event->ioc;
48384837 MPT_FRAME_HDR *mf;