diff --git a/include/sbi/sbi_scratch.h b/include/sbi/sbi_scratch.h
index ec47caf7..e8489002 100644
--- a/include/sbi/sbi_scratch.h
+++ b/include/sbi/sbi_scratch.h
@@ -110,7 +110,7 @@ void sbi_scratch_free_offset(unsigned long offset);
 extern struct sbi_scratch *hartid_to_scratch_table[];
 
 /** Get sbi_scratch from HART id */
-#define sbi_hart_id_to_scratch(__scratch, __hartid) \
+#define sbi_hartid_to_scratch(__hartid) \
 	hartid_to_scratch_table[__hartid]
 
 #endif
diff --git a/lib/sbi/sbi_hsm.c b/lib/sbi/sbi_hsm.c
index bd58782b..e8ca428e 100644
--- a/lib/sbi/sbi_hsm.c
+++ b/lib/sbi/sbi_hsm.c
@@ -59,7 +59,7 @@ int sbi_hsm_hart_get_state(struct sbi_scratch *scratch, u32 hartid)
 {
 	struct sbi_hsm_data *hdata;
 
-	scratch = sbi_hart_id_to_scratch(scratch, hartid);
+	scratch = sbi_hartid_to_scratch(hartid);
 	hdata = sbi_scratch_offset_ptr(scratch, hart_data_offset);
 
 	return atomic_read(&hdata->state);
@@ -163,7 +163,7 @@ int sbi_hsm_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot)
 
 		/* Initialize hart state data for every hart */
 		for (i = 0; i < hart_count; i++) {
-			rscratch = sbi_hart_id_to_scratch(scratch, i);
+			rscratch = sbi_hartid_to_scratch(i);
 			hdata = sbi_scratch_offset_ptr(rscratch,
 						       hart_data_offset);
 			ATOMIC_INIT(&hdata->state,
@@ -215,7 +215,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch, u32 hartid,
 	unsigned int hstate;
 	int rc;
 	const struct sbi_platform *plat = sbi_platform_ptr(scratch);
-	struct sbi_scratch *rscratch = sbi_hart_id_to_scratch(scratch, hartid);
+	struct sbi_scratch *rscratch = sbi_hartid_to_scratch(hartid);
 	struct sbi_hsm_data *hdata = sbi_scratch_offset_ptr(rscratch,
 							    hart_data_offset);
 
diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c
index 113987cf..69015281 100644
--- a/lib/sbi/sbi_init.c
+++ b/lib/sbi/sbi_init.c
@@ -304,7 +304,7 @@ unsigned long sbi_init_count(u32 hartid)
 	    !init_count_offset)
 		return 0;
 
-	scratch = sbi_hart_id_to_scratch(sbi_scratch_thishart_ptr(), hartid);
+	scratch = sbi_hartid_to_scratch(hartid);
 	init_count = sbi_scratch_offset_ptr(scratch, init_count_offset);
 
 	return *init_count;
diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c
index 0781b74f..fdd6e8ae 100644
--- a/lib/sbi/sbi_ipi.c
+++ b/lib/sbi/sbi_ipi.c
@@ -45,7 +45,7 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartid,
 	 * Set IPI type on remote hart's scratch area and
 	 * trigger the interrupt
 	 */
-	remote_scratch = sbi_hart_id_to_scratch(scratch, remote_hartid);
+	remote_scratch = sbi_hartid_to_scratch(remote_hartid);
 	ipi_data = sbi_scratch_offset_ptr(remote_scratch, ipi_data_off);
 
 	if (ipi_ops->update) {
diff --git a/lib/sbi/sbi_scratch.c b/lib/sbi/sbi_scratch.c
index 68c5853f..4dac8f7b 100644
--- a/lib/sbi/sbi_scratch.c
+++ b/lib/sbi/sbi_scratch.c
@@ -71,7 +71,7 @@ done:
 		scratch = sbi_scratch_thishart_ptr();
 		plat = sbi_platform_ptr(scratch);
 		for (i = 0; i < sbi_platform_hart_count(plat); i++) {
-			rscratch = sbi_hart_id_to_scratch(scratch, i);
+			rscratch = sbi_hartid_to_scratch(i);
 			ptr = sbi_scratch_offset_ptr(rscratch, ret);
 			sbi_memset(ptr, 0, size);
 		}
diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c
index a46ddfe9..b21154ce 100644
--- a/lib/sbi/sbi_tlb.c
+++ b/lib/sbi/sbi_tlb.c
@@ -197,7 +197,7 @@ static void sbi_tlb_entry_process(struct sbi_scratch *scratch,
 	sbi_tlb_local_flush(tinfo);
 
 	sbi_hartmask_for_each_hart(rhartid, &tinfo->smask) {
-		rscratch = sbi_hart_id_to_scratch(scratch, rhartid);
+		rscratch = sbi_hartid_to_scratch(rhartid);
 		rtlb_sync = sbi_scratch_offset_ptr(rscratch, tlb_sync_off);
 		while (atomic_raw_xchg_ulong(rtlb_sync, 1)) ;
 	}