diff --git a/src/southbridge/intel/lynxpoint/early_me.c b/src/southbridge/intel/lynxpoint/early_me.c
index 9ab00cdcc8..9f477402b0 100644
--- a/src/southbridge/intel/lynxpoint/early_me.c
+++ b/src/southbridge/intel/lynxpoint/early_me.c
@@ -25,7 +25,7 @@ void intel_early_me_status(void)
 	union me_hfs hfs = { .raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS) };
 	union me_hfs2 hfs2 = { .raw = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS2) };
 
-	intel_me_status(&hfs, &hfs2);
+	intel_me_status(hfs, hfs2);
 }
 
 int intel_early_me_init(void)
diff --git a/src/southbridge/intel/lynxpoint/me.c b/src/southbridge/intel/lynxpoint/me.c
index 7ee7b2c41f..ca6aff7df7 100644
--- a/src/southbridge/intel/lynxpoint/me.c
+++ b/src/southbridge/intel/lynxpoint/me.c
@@ -581,7 +581,7 @@ static enum me_bios_path intel_me_path(struct device *dev)
 	union me_hfs2 hfs2 = { .raw = pci_read_config32(dev, PCI_ME_HFS2) };
 
 	/* Check and dump status */
-	intel_me_status(&hfs, &hfs2);
+	intel_me_status(hfs, hfs2);
 
 	/* Check Current Working State */
 	switch (hfs.working_state) {
diff --git a/src/southbridge/intel/lynxpoint/me.h b/src/southbridge/intel/lynxpoint/me.h
index 45649e0e8d..fe8b0260c4 100644
--- a/src/southbridge/intel/lynxpoint/me.h
+++ b/src/southbridge/intel/lynxpoint/me.h
@@ -334,7 +334,7 @@ enum me_bios_path {
 };
 
 /* Defined in me_status.c for both romstage and ramstage */
-void intel_me_status(union me_hfs *hfs, union me_hfs2 *hfs2);
+void intel_me_status(union me_hfs hfs, union me_hfs2 hfs2);
 
 void intel_early_me_status(void);
 int intel_early_me_init(void);
diff --git a/src/southbridge/intel/lynxpoint/me_status.c b/src/southbridge/intel/lynxpoint/me_status.c
index 3f4d9bcf53..f9e0fcbb5b 100644
--- a/src/southbridge/intel/lynxpoint/me_status.c
+++ b/src/southbridge/intel/lynxpoint/me_status.c
@@ -123,72 +123,72 @@ static const char *me_progress_policy_values[] = {
 	[ME_HFS2_STATE_POLICY_VSCC_NO_MATCH] = "Required VSCC values for flash parts do not match",
 };
 
-void intel_me_status(union me_hfs *hfs, union me_hfs2 *hfs2)
+void intel_me_status(union me_hfs hfs, union me_hfs2 hfs2)
 {
 	if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL < BIOS_DEBUG)
 		return;
 
 	/* Check Current States */
 	printk(BIOS_DEBUG, "ME: FW Partition Table      : %s\n",
-	       hfs->fpt_bad ? "BAD" : "OK");
+	       hfs.fpt_bad ? "BAD" : "OK");
 	printk(BIOS_DEBUG, "ME: Bringup Loader Failure  : %s\n",
-	       hfs->ft_bup_ld_flr ? "YES" : "NO");
+	       hfs.ft_bup_ld_flr ? "YES" : "NO");
 	printk(BIOS_DEBUG, "ME: Firmware Init Complete  : %s\n",
-	       hfs->fw_init_complete ? "YES" : "NO");
+	       hfs.fw_init_complete ? "YES" : "NO");
 	printk(BIOS_DEBUG, "ME: Manufacturing Mode      : %s\n",
-	       hfs->mfg_mode ? "YES" : "NO");
+	       hfs.mfg_mode ? "YES" : "NO");
 	printk(BIOS_DEBUG, "ME: Boot Options Present    : %s\n",
-	       hfs->boot_options_present ? "YES" : "NO");
+	       hfs.boot_options_present ? "YES" : "NO");
 	printk(BIOS_DEBUG, "ME: Update In Progress      : %s\n",
-	       hfs->update_in_progress ? "YES" : "NO");
+	       hfs.update_in_progress ? "YES" : "NO");
 	printk(BIOS_DEBUG, "ME: Current Working State   : %s\n",
-	       me_cws_values[hfs->working_state]);
+	       me_cws_values[hfs.working_state]);
 	printk(BIOS_DEBUG, "ME: Current Operation State : %s\n",
-	       me_opstate_values[hfs->operation_state]);
+	       me_opstate_values[hfs.operation_state]);
 	printk(BIOS_DEBUG, "ME: Current Operation Mode  : %s\n",
-	       me_opmode_values[hfs->operation_mode]);
+	       me_opmode_values[hfs.operation_mode]);
 	printk(BIOS_DEBUG, "ME: Error Code              : %s\n",
-	       me_error_values[hfs->error_code]);
+	       me_error_values[hfs.error_code]);
 	printk(BIOS_DEBUG, "ME: Progress Phase          : %s\n",
-	       me_progress_values[hfs2->progress_code]);
+	       me_progress_values[hfs2.progress_code]);
 	printk(BIOS_DEBUG, "ME: Power Management Event  : %s\n",
-	       me_pmevent_values[hfs2->current_pmevent]);
+	       me_pmevent_values[hfs2.current_pmevent]);
 
 	printk(BIOS_DEBUG, "ME: Progress Phase State    : ");
-	switch (hfs2->progress_code) {
+	switch (hfs2.progress_code) {
 	case ME_HFS2_PHASE_ROM:		/* ROM Phase */
 		printk(BIOS_DEBUG, "%s",
-		       me_progress_rom_values[hfs2->current_state]);
+		       me_progress_rom_values[hfs2.current_state]);
 		break;
 
 	case ME_HFS2_PHASE_BUP:		/* Bringup Phase */
-		if (hfs2->current_state < ARRAY_SIZE(me_progress_bup_values)
-		    && me_progress_bup_values[hfs2->current_state])
+		if (hfs2.current_state < ARRAY_SIZE(me_progress_bup_values)
+		    && me_progress_bup_values[hfs2.current_state])
 			printk(BIOS_DEBUG, "%s",
-			       me_progress_bup_values[hfs2->current_state]);
+			       me_progress_bup_values[hfs2.current_state]);
 		else
-			printk(BIOS_DEBUG, "0x%02x", hfs2->current_state);
+			printk(BIOS_DEBUG, "0x%02x", hfs2.current_state);
 		break;
 
 	case ME_HFS2_PHASE_POLICY:	/* Policy Module Phase */
-		if (hfs2->current_state < ARRAY_SIZE(me_progress_policy_values)
-		    && me_progress_policy_values[hfs2->current_state])
+		if (hfs2.current_state < ARRAY_SIZE(me_progress_policy_values)
+		    && me_progress_policy_values[hfs2.current_state])
 			printk(BIOS_DEBUG, "%s",
-			       me_progress_policy_values[hfs2->current_state]);
+			       me_progress_policy_values[hfs2.current_state]);
 		else
-			printk(BIOS_DEBUG, "0x%02x", hfs2->current_state);
+			printk(BIOS_DEBUG, "0x%02x", hfs2.current_state);
 		break;
 
 	case ME_HFS2_PHASE_HOST_COMM:	/* Host Communication Phase */
-		if (!hfs2->current_state)
+		if (!hfs2.current_state)
 			printk(BIOS_DEBUG, "Host communication established");
 		else
-			printk(BIOS_DEBUG, "0x%02x", hfs2->current_state);
+			printk(BIOS_DEBUG, "0x%02x", hfs2.current_state);
 		break;
 
 	default:
 		printk(BIOS_DEBUG, "Unknown phase: 0x%02x state: 0x%02x",
-		       hfs2->progress_code, hfs2->current_state);
+		       hfs2.progress_code, hfs2.current_state);
 	}
 	printk(BIOS_DEBUG, "\n");
 }