change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/scsi/isci/init.c
..
..
@@ -142,7 +142,7 @@
142
142
 
143
143
 static DEVICE_ATTR(isci_id, S_IRUGO, isci_show_id, NULL);
144
144
 
145
-struct device_attribute *isci_host_attrs[] = {
145
+static struct device_attribute *isci_host_attrs[] = {
146
146
 	&dev_attr_isci_id,
147
147
 	NULL
148
148
 };
..
..
@@ -153,6 +153,7 @@
153
153
 	.name				= DRV_NAME,
154
154
 	.proc_name			= DRV_NAME,
155
155
 	.queuecommand			= sas_queuecommand,
156
+	.dma_need_drain			= ata_scsi_dma_need_drain,
156
157
 	.target_alloc			= sas_target_alloc,
157
158
 	.slave_configure		= sas_slave_configure,
158
159
 	.scan_finished			= isci_host_scan_finished,
..
..
@@ -163,13 +164,15 @@
163
164
 	.this_id			= -1,
164
165
 	.sg_tablesize			= SG_ALL,
165
166
 	.max_sectors			= SCSI_DEFAULT_MAX_SECTORS,
166
-	.use_clustering			= ENABLE_CLUSTERING,
167
167
 	.eh_abort_handler		= sas_eh_abort_handler,
168
168
 	.eh_device_reset_handler        = sas_eh_device_reset_handler,
169
169
 	.eh_target_reset_handler        = sas_eh_target_reset_handler,
170
170
 	.slave_alloc			= sas_slave_alloc,
171
171
 	.target_destroy			= sas_target_destroy,
172
172
 	.ioctl				= sas_ioctl,
173
+#ifdef CONFIG_COMPAT
174
+	.compat_ioctl			= sas_ioctl,
175
+#endif
173
176
 	.shost_attrs			= isci_host_attrs,
174
177
 	.track_queue_depth		= 1,
175
178
 };
..
..
@@ -305,21 +308,10 @@
305
308
 
306
309
 	pci_set_master(pdev);
307
310
 
308
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
309
-	if (err) {
310
-		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
311
-		if (err)
312
-			return err;
313
-	}
314
-
315
-	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
316
-	if (err) {
317
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
318
-		if (err)
319
-			return err;
320
-	}
321
-
322
-	return 0;
311
+	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
312
+	if (err)
313
+		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
314
+	return err;
323
315
 }
324
316
 
325
317
 static int num_controllers(struct pci_dev *pdev)
..
..
@@ -631,7 +623,7 @@
631
623
 		return -ENOMEM;
632
624
 	pci_set_drvdata(pdev, pci_info);
633
625
 
634
-	if (efi_enabled(EFI_RUNTIME_SERVICES))
626
+	if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE))
635
627
 		orom = isci_get_efi_var(pdev);
636
628
 
637
629
 	if (!orom)