errorlog: Deprecate elog callback parameter

There are now no users of the call_out parameter and future users should
use the log_append_msg() and log_append_data() functions, so remove all
references to call_out.

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

20 files changed, 61 insertions, 66 deletions

diff --git a/hw/fsp/fsp-codeupdate.c b/hw/fsp/fsp-codeupdate.c
index 5cac7ca2..bda7222c 100644
--- a/hw/fsp/fsp-codeupdate.c
+++ b/hw/fsp/fsp-codeupdate.c
@@ -68,31 +68,31 @@ int (*fsp_flash_term_hook)(void);
 
 DEFINE_LOG_ENTRY(OPAL_RC_CU_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_CODEUPDATE,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA, NULL);
+		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_CU_FLASH, OPAL_PLATFORM_ERR_EVT, OPAL_CODEUPDATE,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA, NULL);
+		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_CU_SG_LIST, OPAL_PLATFORM_ERR_EVT, OPAL_CODEUPDATE,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA, NULL);
+		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_CU_COMMIT, OPAL_PLATFORM_ERR_EVT, OPAL_CODEUPDATE,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA, NULL);
+		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_CU_MSG, OPAL_PLATFORM_ERR_EVT, OPAL_CODEUPDATE,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA, NULL);
+		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_CU_NOTIFY, OPAL_PLATFORM_ERR_EVT, OPAL_CODEUPDATE,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA, NULL);
+		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_CU_MARKER_LID, OPAL_PLATFORM_ERR_EVT, OPAL_CODEUPDATE,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA, NULL);
+		OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT, OPAL_NA);
 
 static inline void code_update_tce_map(uint32_t tce_offset,
 				       void *buffer, uint32_t size)
diff --git a/hw/fsp/fsp-dump.c b/hw/fsp/fsp-dump.c
index c324b278..c57d7306 100644
--- a/hw/fsp/fsp-dump.c
+++ b/hw/fsp/fsp-dump.c
@@ -116,16 +116,16 @@ static int64_t fsp_dump_read(void);
 DEFINE_LOG_ENTRY(OPAL_RC_DUMP_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
 		 OPAL_PLATFORM_FIRMWARE,
 		 OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_DUMP_LIST, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
 		 OPAL_PLATFORM_FIRMWARE,
 		 OPAL_INFO,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_DUMP_ACK, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 /*
  * Helper functions
diff --git a/hw/fsp/fsp-ipmi.c b/hw/fsp/fsp-ipmi.c
index e5cd6e26..bc425b1a 100644
--- a/hw/fsp/fsp-ipmi.c
+++ b/hw/fsp/fsp-ipmi.c
@@ -45,10 +45,10 @@
 
 DEFINE_LOG_ENTRY(OPAL_RC_IPMI_REQ, OPAL_PLATFORM_ERR_EVT, OPAL_IPMI,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 DEFINE_LOG_ENTRY(OPAL_RC_IPMI_RESP, OPAL_PLATFORM_ERR_EVT, OPAL_IPMI,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 struct fsp_ipmi_msg {
 	struct list_node	link;
diff --git a/hw/fsp/fsp-leds.c b/hw/fsp/fsp-leds.c
index 2f478d6f..dba7b355 100644
--- a/hw/fsp/fsp-leds.c
+++ b/hw/fsp/fsp-leds.c
@@ -92,21 +92,21 @@ static int process_led_state_change(void);
 
 DEFINE_LOG_ENTRY(OPAL_RC_LED_SPCN, OPAL_PLATFORM_ERR_EVT, OPAL_LED,
 		OPAL_PLATFORM_FIRMWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_LED_BUFF, OPAL_PLATFORM_ERR_EVT, OPAL_LED,
 		OPAL_PLATFORM_FIRMWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_LED_LC, OPAL_PLATFORM_ERR_EVT, OPAL_LED,
-		OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA, NULL);
+		OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_LED_STATE, OPAL_PLATFORM_ERR_EVT, OPAL_LED,
 		OPAL_PLATFORM_FIRMWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_LED_SUPPORT, OPAL_PLATFORM_ERR_EVT, OPAL_LED,
-		OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA, NULL);
+		OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA);
 
 
 /* Find descendent LED record with CEC location code in CEC list */
diff --git a/hw/fsp/fsp-mdst-table.c b/hw/fsp/fsp-mdst-table.c
index f6abc4bf..9c71cda0 100644
--- a/hw/fsp/fsp-mdst-table.c
+++ b/hw/fsp/fsp-mdst-table.c
@@ -46,18 +46,18 @@
 
 DEFINE_LOG_ENTRY(OPAL_RC_DUMP_MDST_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_DUMP_MDST_UPDATE, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
 		 OPAL_PLATFORM_FIRMWARE,
 		 OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_DUMP_MDST_ADD, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
-		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA, NULL);
+		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_DUMP_MDST_REMOVE, OPAL_PLATFORM_ERR_EVT, OPAL_DUMP,
-		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA, NULL);
+		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA);
 
 
 static struct dump_mdst_table *mdst_table;
diff --git a/hw/fsp/fsp-mem-err.c b/hw/fsp/fsp-mem-err.c
index a4b45fc5..019e7374 100644
--- a/hw/fsp/fsp-mem-err.c
+++ b/hw/fsp/fsp-mem-err.c
@@ -43,11 +43,11 @@ static struct lock mem_err_lock = LOCK_UNLOCKED;
 
 DEFINE_LOG_ENTRY(OPAL_RC_MEM_ERR_RES, OPAL_PLATFORM_ERR_EVT, OPAL_MEM_ERR,
 			OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-			OPAL_NA, NULL);
+			OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_MEM_ERR_DEALLOC, OPAL_PLATFORM_ERR_EVT, OPAL_MEM_ERR,
 			OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-			OPAL_NA, NULL);
+			OPAL_NA);
 
 static bool send_response_to_fsp(u32 cmd_sub_mod)
 {
diff --git a/hw/fsp/fsp-nvram.c b/hw/fsp/fsp-nvram.c
index 2d518f3f..85b7e815 100644
--- a/hw/fsp/fsp-nvram.c
+++ b/hw/fsp/fsp-nvram.c
@@ -81,23 +81,23 @@ static enum nvram_state fsp_nvram_state = NVRAM_STATE_CLOSED;
 
 DEFINE_LOG_ENTRY(OPAL_RC_NVRAM_INIT, OPAL_PLATFORM_ERR_EVT , OPAL_NVRAM,
 		OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_NVRAM_OPEN, OPAL_PLATFORM_ERR_EVT, OPAL_NVRAM,
 		OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_NVRAM_SIZE, OPAL_PLATFORM_ERR_EVT, OPAL_NVRAM,
 		OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_NVRAM_READ, OPAL_PLATFORM_ERR_EVT, OPAL_NVRAM,
 		OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_NVRAM_WRITE, OPAL_PLATFORM_ERR_EVT, OPAL_NVRAM,
 		OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 static void fsp_nvram_send_write(void);
 
diff --git a/hw/fsp/fsp-op-panel.c b/hw/fsp/fsp-op-panel.c
index 139a1a76..65e0f486 100644
--- a/hw/fsp/fsp-op-panel.c
+++ b/hw/fsp/fsp-op-panel.c
@@ -24,8 +24,7 @@
 #include <errorlog.h>
 
 DEFINE_LOG_ENTRY(OPAL_RC_PANEL_WRITE, OPAL_PLATFORM_ERR_EVT, OPAL_OP_PANEL,
-		 OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		 OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL, OPAL_NA);
 
 /* For OPAL OP_PANEL API we can only have one in flight due to TCEs */
 static struct fsp_msg *op_req;
diff --git a/hw/fsp/fsp-rtc.c b/hw/fsp/fsp-rtc.c
index cde1b373..6b982179 100644
--- a/hw/fsp/fsp-rtc.c
+++ b/hw/fsp/fsp-rtc.c
@@ -108,12 +108,10 @@ static unsigned long read_req_tb;
 static const int rtc_read_timeout_ms = 1500;
 
 DEFINE_LOG_ENTRY(OPAL_RC_RTC_TOD, OPAL_PLATFORM_ERR_EVT, OPAL_RTC,
-			OPAL_PLATFORM_FIRMWARE, OPAL_INFO,
-			OPAL_NA, NULL);
+			OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_RTC_READ, OPAL_PLATFORM_ERR_EVT, OPAL_RTC,
-			OPAL_PLATFORM_FIRMWARE, OPAL_INFO,
-			OPAL_NA, NULL);
+			OPAL_PLATFORM_FIRMWARE, OPAL_INFO, OPAL_NA);
 
 static void fsp_tpo_req_complete(struct fsp_msg *read_resp)
 {
diff --git a/hw/fsp/fsp-sensor.c b/hw/fsp/fsp-sensor.c
index ccffbfc6..d83f1a1f 100644
--- a/hw/fsp/fsp-sensor.c
+++ b/hw/fsp/fsp-sensor.c
@@ -50,15 +50,15 @@
 DEFINE_LOG_ENTRY(OPAL_RC_SENSOR_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_SENSOR,
 			OPAL_MISC_SUBSYSTEM,
 			OPAL_PREDICTIVE_ERR_FAULT_RECTIFY_REBOOT,
-			OPAL_NA, NULL);
+			OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SENSOR_READ, OPAL_PLATFORM_ERR_EVT, OPAL_SENSOR,
 			OPAL_MISC_SUBSYSTEM, OPAL_INFO,
-			OPAL_NA, NULL);
+			OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SENSOR_ASYNC_COMPLETE, OPAL_PLATFORM_ERR_EVT,
 			OPAL_SENSOR, OPAL_MISC_SUBSYSTEM, OPAL_INFO,
-			OPAL_NA, NULL);
+			OPAL_NA);
 
 /* FSP response status codes */
 enum {
diff --git a/hw/fsp/fsp-surveillance.c b/hw/fsp/fsp-surveillance.c
index 18b2afd5..24acead9 100644
--- a/hw/fsp/fsp-surveillance.c
+++ b/hw/fsp/fsp-surveillance.c
@@ -33,15 +33,15 @@ static struct lock surv_lock = LOCK_UNLOCKED;
 
 DEFINE_LOG_ENTRY(OPAL_RC_SURVE_INIT, OPAL_MISC_ERR_EVT, OPAL_SURVEILLANCE,
 		OPAL_SURVEILLANCE_ERR, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_MISCELLANEOUS_INFO_ONLY, NULL);
+		OPAL_MISCELLANEOUS_INFO_ONLY);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SURVE_STATUS, OPAL_MISC_ERR_EVT, OPAL_SURVEILLANCE,
 		OPAL_SURVEILLANCE_ERR, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_MISCELLANEOUS_INFO_ONLY, NULL);
+		OPAL_MISCELLANEOUS_INFO_ONLY);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SURVE_ACK, OPAL_MISC_ERR_EVT, OPAL_SURVEILLANCE,
 		OPAL_SURVEILLANCE_ERR, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_MISCELLANEOUS_INFO_ONLY, NULL);
+		OPAL_MISCELLANEOUS_INFO_ONLY);
 
 static void fsp_surv_ack(struct fsp_msg *msg)
 {
diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c
index 9a27a6fb..a23384c6 100644
--- a/hw/fsp/fsp.c
+++ b/hw/fsp/fsp.c
@@ -40,7 +40,7 @@
 #include <ccan/list/list.h>
 
 DEFINE_LOG_ENTRY(OPAL_RC_FSP_POLL_TIMEOUT, OPAL_PLATFORM_ERR_EVT, OPAL_FSP,
-		 OPAL_PLATFORM_FIRMWARE, OPAL_ERROR_PANIC, OPAL_NA, NULL);
+		 OPAL_PLATFORM_FIRMWARE, OPAL_ERROR_PANIC, OPAL_NA);
 
 #define FSP_TRACE_MSG
 #define FSP_TRACE_EVENT
diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c
index a4c0086c..5c5d942b 100644
--- a/hw/lpc-uart.c
+++ b/hw/lpc-uart.c
@@ -29,7 +29,7 @@
 
 DEFINE_LOG_ENTRY(OPAL_RC_UART_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_UART,
 		 OPAL_CEC_HARDWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 /* UART reg defs */
 #define REG_RBR		0
diff --git a/hw/lpc.c b/hw/lpc.c
index c165c2dd..c6eba7d3 100644
--- a/hw/lpc.c
+++ b/hw/lpc.c
@@ -29,11 +29,11 @@
 
 DEFINE_LOG_ENTRY(OPAL_RC_LPC_READ, OPAL_PLATFORM_ERR_EVT, OPAL_LPC,
 		 OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_LPC_WRITE, OPAL_PLATFORM_ERR_EVT, OPAL_LPC,
 		 OPAL_MISC_SUBSYSTEM, OPAL_PREDICTIVE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 #define ECCB_CTL	0 /* b0020 -> b00200 */
 #define ECCB_STAT	2 /* b0022 -> b00210 */
diff --git a/hw/occ.c b/hw/occ.c
index 790efa6a..8732133d 100644
--- a/hw/occ.c
+++ b/hw/occ.c
@@ -63,19 +63,19 @@ struct occ_pstate_table {
 
 DEFINE_LOG_ENTRY(OPAL_RC_OCC_LOAD, OPAL_PLATFORM_ERR_EVT, OPAL_OCC,
 		OPAL_CEC_HARDWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_OCC_RESET, OPAL_PLATFORM_ERR_EVT, OPAL_OCC,
 		OPAL_CEC_HARDWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_OCC_PSTATE_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_OCC,
 		OPAL_CEC_HARDWARE, OPAL_INFO,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_OCC_TIMEOUT, OPAL_PLATFORM_ERR_EVT, OPAL_OCC,
-		 OPAL_CEC_HARDWARE, OPAL_UNRECOVERABLE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		OPAL_CEC_HARDWARE, OPAL_UNRECOVERABLE_ERR_GENERAL,
+		OPAL_NA);
 
 /* Check each chip's HOMER/Sapphire area for PState valid bit */
 static bool wait_for_all_occ_init(void)
diff --git a/hw/p8-i2c.c b/hw/p8-i2c.c
index 5295ad8c..775e777c 100644
--- a/hw/p8-i2c.c
+++ b/hw/p8-i2c.c
@@ -33,15 +33,15 @@
 
 DEFINE_LOG_ENTRY(OPAL_RC_I2C_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_I2C,
 		 OPAL_IO_SUBSYSTEM, OPAL_PREDICTIVE_ERR_DEGRADED_PERF,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 DEFINE_LOG_ENTRY(OPAL_RC_I2C_START_REQ, OPAL_INPUT_OUTPUT_ERR_EVT, OPAL_I2C,
-		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA, NULL);
+		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA);
 DEFINE_LOG_ENTRY(OPAL_RC_I2C_TIMEOUT, OPAL_INPUT_OUTPUT_ERR_EVT, OPAL_I2C,
-		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA, NULL);
+		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA);
 DEFINE_LOG_ENTRY(OPAL_RC_I2C_TRANSFER, OPAL_INPUT_OUTPUT_ERR_EVT, OPAL_I2C,
-		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA, NULL);
+		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA);
 DEFINE_LOG_ENTRY(OPAL_RC_I2C_RESET, OPAL_INPUT_OUTPUT_ERR_EVT, OPAL_I2C,
-		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA, NULL);
+		 OPAL_IO_SUBSYSTEM, OPAL_INFO, OPAL_NA);
 
 #ifdef DEBUG
 #define DBG(fmt...) prlog(PR_ERR, "I2C: " fmt)
diff --git a/hw/psi.c b/hw/psi.c
index 0a013b51..982d674c 100644
--- a/hw/psi.c
+++ b/hw/psi.c
@@ -46,7 +46,7 @@ static struct lock psi_lock = LOCK_UNLOCKED;
 
 DEFINE_LOG_ENTRY(OPAL_RC_PSI_TIMEOUT, OPAL_PLATFORM_ERR_EVT, OPAL_PSI,
 		OPAL_PLATFORM_FIRMWARE,
-		OPAL_UNRECOVERABLE_ERR_LOSS_OF_FUNCTION, OPAL_NA, NULL);
+		OPAL_UNRECOVERABLE_ERR_LOSS_OF_FUNCTION, OPAL_NA);
 
 void psi_set_link_polling(bool active)
 {
diff --git a/hw/slw.c b/hw/slw.c
index 1694597f..a097b206 100644
--- a/hw/slw.c
+++ b/hw/slw.c
@@ -45,19 +45,19 @@ extern void enter_rvwinkle(void);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SLW_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_SLW,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SLW_SET, OPAL_PLATFORM_ERR_EVT, OPAL_SLW,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SLW_GET, OPAL_PLATFORM_ERR_EVT, OPAL_SLW,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_SLW_REG, OPAL_PLATFORM_ERR_EVT, OPAL_SLW,
 		 OPAL_PLATFORM_FIRMWARE, OPAL_INFO,
-		 OPAL_NA, NULL);
+		 OPAL_NA);
 
 #ifdef __HAVE_LIBPORE__
 static void slw_do_rvwinkle(void *data)
diff --git a/hw/xscom.c b/hw/xscom.c
index 9d3523c7..ef3ff0f1 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -43,15 +43,15 @@
 
 DEFINE_LOG_ENTRY(OPAL_RC_XSCOM_RW, OPAL_PLATFORM_ERR_EVT, OPAL_XSCOM,
 		OPAL_CEC_HARDWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_XSCOM_INDIRECT_RW, OPAL_PLATFORM_ERR_EVT, OPAL_XSCOM,
 		OPAL_CEC_HARDWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 DEFINE_LOG_ENTRY(OPAL_RC_XSCOM_RESET, OPAL_PLATFORM_ERR_EVT, OPAL_XSCOM,
 		OPAL_CEC_HARDWARE, OPAL_PREDICTIVE_ERR_GENERAL,
-		OPAL_NA, NULL);
+		OPAL_NA);
 
 /*
  * Locking notes:
diff --git a/include/errorlog.h b/include/errorlog.h
index eb374523..b908fd48 100644
--- a/include/errorlog.h
+++ b/include/errorlog.h
@@ -149,7 +149,6 @@ struct opal_err_info {
 	uint8_t subsystem;
 	uint8_t sev;
 	uint8_t event_subtype;
-	void (*call_out)(struct errorlog *buf, void *data, uint16_t size);
 };
 
 /* Component IDs */
@@ -326,10 +325,9 @@ enum opal_reasoncode {
 };
 
 #define DEFINE_LOG_ENTRY(reason, type, id, subsys,			\
-severity, subtype, callout_func) static struct opal_err_info err_##reason =	\
+severity, subtype) static struct opal_err_info err_##reason =		\
 { .reason_code = reason, .err_type = type, .cmp_id = id,		\
-.subsystem = subsys, .sev = severity, .event_subtype = subtype,		\
-.call_out = callout_func }
+.subsystem = subsys, .sev = severity, .event_subtype = subtype }
 
 /* This is wrapper around the error log function, which creates
  * and commits the error to FSP.