3 files changed, 11 insertions, 11 deletions
diff --git a/src/soc/amd/common/block/psp/psp.c b/src/soc/amd/common/block/psp/psp.c
index 479c28bc33..5f33c82e19 100644
--- a/src/soc/amd/common/block/psp/psp.c
+++ b/src/soc/amd/common/block/psp/psp.c
@@ -39,19 +39,19 @@ static const char *status_to_string(int err)
 	}
 }
 
-static u32 rd_resp_sts(struct mbox_default_buffer *buffer)
+static u32 rd_resp_sts(struct mbox_buffer_header *header)
 {
-	return read32(&buffer->header.status);
+	return read32(&header->status);
 }
 
 /*
  * Print meaningful status to the console.  Caller only passes a pointer to a
- * buffer if it's expected to contain its own status.
+ * buffer header if it's expected to contain its own status.
  */
-void psp_print_cmd_status(int cmd_status, struct mbox_default_buffer *buffer)
+void psp_print_cmd_status(int cmd_status, struct mbox_buffer_header *header)
 {
-	if (buffer && rd_resp_sts(buffer))
-		printk(BIOS_DEBUG, "buffer status=0x%x ", rd_resp_sts(buffer));
+	if (header && rd_resp_sts(header))
+		printk(BIOS_DEBUG, "buffer status=0x%x ", rd_resp_sts(header));
 
 	if (cmd_status)
 		printk(BIOS_DEBUG, "%s\n", status_to_string(cmd_status));
@@ -77,7 +77,7 @@ int psp_notify_dram(void)
 	cmd_status = send_psp_command(MBOX_BIOS_CMD_DRAM_INFO, &buffer);
 
 	/* buffer's status shouldn't change but report it if it does */
-	psp_print_cmd_status(cmd_status, &buffer);
+	psp_print_cmd_status(cmd_status, &buffer.header);
 
 	return cmd_status;
 }
@@ -101,7 +101,7 @@ static void psp_notify_boot_done(void *unused)
 	cmd_status = send_psp_command(MBOX_BIOS_CMD_BOOT_DONE, &buffer);
 
 	/* buffer's status shouldn't change but report it if it does */
-	psp_print_cmd_status(cmd_status, &buffer);
+	psp_print_cmd_status(cmd_status, &buffer.header);
 }
 
 BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY,
diff --git a/src/soc/amd/common/block/psp/psp_def.h b/src/soc/amd/common/block/psp/psp_def.h
index 7772ca6bda..7bdec21943 100644
--- a/src/soc/amd/common/block/psp/psp_def.h
+++ b/src/soc/amd/common/block/psp/psp_def.h
@@ -109,7 +109,7 @@ struct mbox_cmd_sx_info_buffer {
 #define PSP_INIT_TIMEOUT 10000 /* 10 seconds */
 #define PSP_CMD_TIMEOUT 1000 /* 1 second */
 
-void psp_print_cmd_status(int cmd_status, struct mbox_default_buffer *buffer);
+void psp_print_cmd_status(int cmd_status, struct mbox_buffer_header *header);
 
 /* This command needs to be implemented by the generation specific code. */
 int send_psp_command(u32 command, void *buffer);
diff --git a/src/soc/amd/common/block/psp/psp_smm.c b/src/soc/amd/common/block/psp/psp_smm.c
index 4ae2277cab..7ffa6b6116 100644
--- a/src/soc/amd/common/block/psp/psp_smm.c
+++ b/src/soc/amd/common/block/psp/psp_smm.c
@@ -72,7 +72,7 @@ int psp_notify_smm(void)
 	clear_smm_flag();
 
 	/* buffer's status shouldn't change but report it if it does */
-	psp_print_cmd_status(cmd_status, (struct mbox_default_buffer *)&buffer);
+	psp_print_cmd_status(cmd_status, &buffer.header);
 
 	return cmd_status;
 }
@@ -102,5 +102,5 @@ void psp_notify_sx_info(u8 sleep_type)
 	clear_smm_flag();
 
 	/* buffer's status shouldn't change but report it if it does */
-	psp_print_cmd_status(cmd_status, (struct mbox_default_buffer *)buffer);
+	psp_print_cmd_status(cmd_status, &buffer->header);
 }