diff -Nrpu /tmp/d/isci-1.2.0/init.c drivers/scsi/isci/init.c
--- /tmp/d/isci-1.2.0/init.c	2018-11-21 02:22:14.000000000 -0600
+++ drivers/scsi/isci/init.c	2021-06-22 15:53:39.671745869 -0500
@@ -588,6 +588,13 @@ static struct isci_host *isci_host_alloc
 	shost->max_lun = ~0;
 	shost->max_cmd_len = MAX_COMMAND_SIZE;
 
+	/* turn on DIF support */
+	scsi_host_set_prot(shost,
+			   SHOST_DIF_TYPE1_PROTECTION |
+			   SHOST_DIF_TYPE2_PROTECTION |
+			   SHOST_DIF_TYPE3_PROTECTION);
+	scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
+
 	err = scsi_add_host(shost, &pdev->dev);
 	if (err)
 		goto err_shost;
@@ -675,13 +682,6 @@ static int isci_pci_probe(struct pci_dev
 			goto err_host_alloc;
 		}
 		pci_info->hosts[i] = h;
-
-		/* turn on DIF support */
-		scsi_host_set_prot(to_shost(h),
-				   SHOST_DIF_TYPE1_PROTECTION |
-				   SHOST_DIF_TYPE2_PROTECTION |
-				   SHOST_DIF_TYPE3_PROTECTION);
-		scsi_host_set_guard(to_shost(h), SHOST_DIX_GUARD_CRC);
 	}
 
 	err = isci_setup_interrupts(pdev);
diff -Nrpu /tmp/d/isci-1.2.0/Makefile drivers/scsi/isci/Makefile
--- /tmp/d/isci-1.2.0/Makefile	2021-05-10 11:21:30.639849426 -0500
+++ drivers/scsi/isci/Makefile	2021-06-02 12:32:30.226027414 -0500
@@ -1,46 +1,9 @@
-# If KERNELRELEASE is defined, the make command using this Makefile has
-# been invoked by the kernel build system and so can use its language.
-# Otherwise, if KERNELRELEASE is null, a make command was issued from
-# the command line. So invoke the kernel build system.
-
-ifeq ($(KERNELRELEASE),)
-
-    # KVERSION should be set in the environment if this
-    # build is not for the currently running kernel.
-    KVERSION ?= $(shell uname -r)
-
-    # BUILD_DIR should be set in the environment if a
-    # subdirectory of /lib/modules/ is not appropriate.
-    BUILD_DIR ?= /lib/modules/${KVERSION}/build
-
-    PWD := $(shell pwd)
-
-modules:
-	$(MAKE) -C $(BUILD_DIR) M=$(PWD) modules
-
-modules_install:
-	$(MAKE) -C $(BUILD_DIR) M=$(PWD) modules_install
-
-clean:
-	rm -rf *~ *.o .*.cmd *.mod.c *.ko *.ko.unsigned .depend \
-	.tmp_versions modules.order Module.symvers Module.markers
-
-.PHONY: modules modules_install clean
-
-else
-
-# Called from kernel build system -- just declare the module(s).
-
-# obj-m	+= scsi_transport_sas.o
-# obj-m	+= libsas/
-
-obj-m += isci.o
+# SPDX-License-Identifier: GPL-2.0
+obj-$(CONFIG_SCSI_ISCI) += isci.o
 isci-objs := init.o phy.o request.o \
 	     remote_device.o port.o \
 	     host.o task.o probe_roms.o \
 	     remote_node_context.o \
 	     remote_node_table.o \
 	     unsolicited_frame_control.o \
-	     port_config.o
-
-endif
+	     port_config.o \
diff -Nrpu /tmp/d/isci-1.2.0/phy.c drivers/scsi/isci/phy.c
--- /tmp/d/isci-1.2.0/phy.c	2018-11-21 02:22:14.000000000 -0600
+++ drivers/scsi/isci/phy.c	2021-06-22 15:53:39.671745869 -0500
@@ -753,7 +753,6 @@ enum sci_status sci_phy_event_handler(st
 		default:
 			phy_event_warn(iphy, state, event_code);
 			return SCI_FAILURE;
-			break;
 		}
 		return SCI_SUCCESS;
 	case SCI_PHY_SUB_AWAIT_IAF_UF:
@@ -957,7 +956,6 @@ enum sci_status sci_phy_event_handler(st
 		default:
 			phy_event_warn(iphy, state, event_code);
 			return SCI_FAILURE_INVALID_STATE;
-			break;
 		}
 		return SCI_SUCCESS;
 	default: