diff --git a/sys/arm/qualcomm/qcom_scm_legacy.c b/sys/arm/qualcomm/qcom_scm_legacy.c
--- a/sys/arm/qualcomm/qcom_scm_legacy.c
+++ b/sys/arm/qualcomm/qcom_scm_legacy.c
@@ -73,8 +73,8 @@
 	    | QCOM_SCM_FLAG_COLDBOOT_CPU3;
 	uint32_t scm_arg2 = pmap_kextract((vm_offset_t)mp_entry_func);
 
-	ret = arm_smccc_smc(scm_arg0, (uint32_t) &context_id, scm_arg1,
-	    scm_arg2, 0, 0, 0, 0, &res);
+	ret = arm_smccc_invoke_smc(scm_arg0, (uint32_t) &context_id, scm_arg1,
+	    scm_arg2, &res);
 
 	if (ret == 0 && res.a0 == 0)
 		return (0);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_pmc.c b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
--- a/sys/arm64/nvidia/tegra210/tegra210_pmc.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
@@ -190,7 +190,7 @@
 	struct arm_smccc_res res;
 
 	if (sc->secure_access) {
-		arm_smccc_smc(PMC_SMC, PMC_SMC_WRITE, r, v, 0, 0, 0, 0, &res);
+		arm_smccc_invoke_smc(PMC_SMC, PMC_SMC_WRITE, r, v, &res);
 		if (res.a0 != 0)
 			device_printf(sc->dev," PMC SMC write failed: %lu\n",
 			    res.a0);
@@ -205,7 +205,7 @@
 	struct arm_smccc_res res;
 
 	if (sc->secure_access) {
-		arm_smccc_smc(PMC_SMC, PMC_SMC_READ, r, 0, 0, 0, 0, 0, &res);
+		arm_smccc_invoke_smc(PMC_SMC, PMC_SMC_READ, r, &res);
 		if (res.a0 != 0)
 			device_printf(sc->dev," PMC SMC write failed: %lu\n",
 			    res.a0);
diff --git a/sys/dev/firmware/arm/scmi_smc.c b/sys/dev/firmware/arm/scmi_smc.c
--- a/sys/dev/firmware/arm/scmi_smc.c
+++ b/sys/dev/firmware/arm/scmi_smc.c
@@ -106,7 +106,7 @@
 	if (ret != 0)
 		return (ret);
 
-	arm_smccc_smc(sc->smc_id, 0, 0, 0, 0, 0, 0, 0, NULL);
+	arm_smccc_invoke_smc(sc->smc_id, NULL);
 
 	return (0);
 }
diff --git a/sys/dev/firmware/xilinx/zynqmp_firmware.c b/sys/dev/firmware/xilinx/zynqmp_firmware.c
--- a/sys/dev/firmware/xilinx/zynqmp_firmware.c
+++ b/sys/dev/firmware/xilinx/zynqmp_firmware.c
@@ -105,7 +105,7 @@
 	args[0] = id | PM_SIP_SVC;
 	args[1] = ((uint64_t)a1 << 32) | a0;
 	args[2] = ((uint64_t)a3 << 32) | a2;
-	arm_smccc_smc(args[0], args[1], args[2], 0, 0, 0, 0, 0, &res);
+	arm_smccc_invoke_smc(args[0], args[1], args[2], &res);
 	if (payload != NULL) {
 		payload[0] = res.a0 & 0xFFFFFFFF;
 		payload[1] = res.a0 >> 32;
diff --git a/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c b/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c
--- a/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c
+++ b/sys/dev/hyperv/vmbus/aarch64/hyperv_machdep.c
@@ -50,10 +50,10 @@
 void
 arm_hv_set_vreg(u32 msr, u64 value)
 {
-	arm_smccc_hvc(HV_FUNC_ID,
+	arm_smccc_invoke_hvc(HV_FUNC_ID,
 	    HVCALL_SET_VP_REGISTERS | HV_HYPERCALL_FAST_BIT |
 		HV_HYPERCALL_REP_COMP_1,
-	    HV_PARTITION_ID_SELF, HV_VP_INDEX_SELF, msr, 0, value, 0, NULL);
+	    HV_PARTITION_ID_SELF, HV_VP_INDEX_SELF, msr, 0, value, NULL);
 }
 
 void
@@ -95,8 +95,7 @@
 {
 	struct arm_smccc_res res;
 
-	arm_smccc_hvc(HV_FUNC_ID, in_val, in_paddr, out_paddr, 0, 0, 0, 0,
-	    &res);
+	arm_smccc_invoke_hvc(HV_FUNC_ID, in_val, in_paddr, out_paddr, &res);
 
 	return (res.a0);
 }
diff --git a/sys/dev/pci/pci_host_generic_den0115.c b/sys/dev/pci/pci_host_generic_den0115.c
--- a/sys/dev/pci/pci_host_generic_den0115.c
+++ b/sys/dev/pci/pci_host_generic_den0115.c
@@ -124,8 +124,7 @@
 {
 	struct arm_smccc_res result;
 
-	if (psci_callfn(SMCCC_PCI_FEATURES, pci_func_id, 0, 0, 0, 0, 0, 0,
-	    &result) < 0) {
+	if (arm_smccc_invoke(SMCCC_PCI_FEATURES, pci_func_id, &result) < 0) {
 		return (false);
 	}
 
@@ -137,7 +136,7 @@
 {
 	struct arm_smccc_res result;
 
-	if (psci_callfn(SMCCC_PCI_VERSION, 0, 0, 0, 0, 0, 0, 0, &result) < 0) {
+	if (arm_smccc_invoke(SMCCC_PCI_VERSION, &result) < 0) {
 		return (false);
 	}
 
@@ -185,8 +184,8 @@
 		return (error);
 
 	if (pci_host_acpi_smccc_has_feature(SMCCC_PCI_GET_SEG_INFO) &&
-	    psci_callfn(SMCCC_PCI_GET_SEG_INFO, sc->base.ecam, 0, 0, 0, 0, 0,
-	     0, &result) == SMCCC_RET_SUCCESS) {
+	    arm_smccc_invoke(SMCCC_PCI_GET_SEG_INFO, sc->base.ecam,
+	    &result) == SMCCC_RET_SUCCESS) {
 		start = SMCCC_PCI_SEG_START(result.a1);
 		end = SMCCC_PCI_SEG_END(result.a1);
 
@@ -215,8 +214,7 @@
 		return (~0U);
 
 	addr = (sc->base.ecam << 16) | (bus << 8) | (slot << 3) | (func << 0);
-	if (psci_callfn(SMCCC_PCI_READ, addr, reg, bytes, 0, 0, 0, 0,
-	    &result) < 0) {
+	if (arm_smccc_invoke(SMCCC_PCI_READ, addr, reg, bytes, &result) < 0) {
 		return (~0U);
 	}
 
@@ -240,7 +238,7 @@
 		return;
 
 	addr = (sc->base.ecam << 16) | (bus << 8) | (slot << 3) | (func << 0);
-	psci_callfn(SMCCC_PCI_WRITE, addr, reg, bytes, val, 0, 0, 0, &result);
+	arm_smccc_invoke(SMCCC_PCI_WRITE, addr, reg, bytes, val, &result);
 }
 
 static device_method_t generic_pcie_acpi_smccc_methods[] = {
diff --git a/sys/dev/psci/smccc.c b/sys/dev/psci/smccc.c
--- a/sys/dev/psci/smccc.c
+++ b/sys/dev/psci/smccc.c
@@ -81,7 +81,7 @@
 	if (smccc_version == SMCCC_VERSION_1_0)
 		return (PSCI_RETVAL_NOT_SUPPORTED);
 
-	return (psci_call(SMCCC_ARCH_FEATURES, smccc_func_id, 0, 0));
+	return (arm_smccc_invoke(SMCCC_ARCH_FEATURES, smccc_func_id, NULL));
 }
 
 /*
@@ -95,7 +95,7 @@
 	MPASS(smccc_version != 0);
 	KASSERT(smccc_version != SMCCC_VERSION_1_0,
 	    ("SMCCC arch workaround 1 called with an invalid SMCCC interface"));
-	return (psci_call(SMCCC_ARCH_WORKAROUND_1, 0, 0, 0));
+	return (arm_smccc_invoke(SMCCC_ARCH_WORKAROUND_1, NULL));
 }
 
 int
@@ -105,5 +105,5 @@
 	MPASS(smccc_version != 0);
 	KASSERT(smccc_version != SMCCC_VERSION_1_0,
 	    ("SMCCC arch workaround 2 called with an invalid SMCCC interface"));
-	return (psci_call(SMCCC_ARCH_WORKAROUND_2, enable, 0, 0));
+	return (arm_smccc_invoke(SMCCC_ARCH_WORKAROUND_2, enable, NULL));
 }