From 69cc557cfb6eb2cbb5b137bc206cd759c1dba5f0 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 4 Mar 2022 17:49:56 -0800 Subject: commonlib/bsd: Remove cb_err_t cb_err_t was meant to be used in place of `enum cb_err` in all situations, but the choice to use a typedef here seems to be controversial. We should not be arbitrarily using two different identifiers for the same thing across the codebase, so since there are no use cases for serializing enum cb_err at the moment (which would be the primary reason to typedef a fixed-width integer instead), remove cb_err_t again for now. Signed-off-by: Julius Werner Change-Id: Iaec36210d129db26d51f0a105d3de070c03b686b Reviewed-on: https://review.coreboot.org/c/coreboot/+/62600 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu Reviewed-by: Tim Wawrzynczak --- src/soc/qualcomm/sc7180/display/dsi.c | 9 +++++---- src/soc/qualcomm/sc7180/include/soc/display/mipi_dsi.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/soc/qualcomm') diff --git a/src/soc/qualcomm/sc7180/display/dsi.c b/src/soc/qualcomm/sc7180/display/dsi.c index 48dc2b395d..9e6977ca7b 100644 --- a/src/soc/qualcomm/sc7180/display/dsi.c +++ b/src/soc/qualcomm/sc7180/display/dsi.c @@ -204,11 +204,12 @@ static int mdss_dsi_cmd_dma_trigger_for_panel(void) return status; } -static cb_err_t mdss_dsi_send_init_cmd(enum mipi_dsi_transaction type, const u8 *body, u8 len) +static enum cb_err mdss_dsi_send_init_cmd(enum mipi_dsi_transaction type, const u8 *body, + u8 len) { uint8_t *pload = _dma_coherent; uint32_t size; - cb_err_t ret = CB_SUCCESS; + enum cb_err ret = CB_SUCCESS; int data = 0; uint32_t *bp = NULL; @@ -276,7 +277,7 @@ static void mdss_dsi_clear_intr(void) write32(&dsi0->err_int_mask0, 0x13FF3BFF); } -cb_err_t mdss_dsi_panel_initialize(const u8 *init_cmds) +enum cb_err mdss_dsi_panel_initialize(const u8 *init_cmds) { uint32_t ctrl_mode = 0; @@ -286,7 +287,7 @@ cb_err_t mdss_dsi_panel_initialize(const u8 *init_cmds) /* Enable command mode before sending the commands */ write32(&dsi0->ctrl, ctrl_mode | 0x04); - cb_err_t ret = mipi_panel_parse_init_commands(init_cmds, mdss_dsi_send_init_cmd); + enum cb_err ret = mipi_panel_parse_init_commands(init_cmds, mdss_dsi_send_init_cmd); write32(&dsi0->ctrl, ctrl_mode); mdss_dsi_clear_intr(); diff --git a/src/soc/qualcomm/sc7180/include/soc/display/mipi_dsi.h b/src/soc/qualcomm/sc7180/include/soc/display/mipi_dsi.h index a7c9b6e4af..12e51491fb 100644 --- a/src/soc/qualcomm/sc7180/include/soc/display/mipi_dsi.h +++ b/src/soc/qualcomm/sc7180/include/soc/display/mipi_dsi.h @@ -22,6 +22,6 @@ enum { enum cb_err mdss_dsi_config(struct edid *edid, uint32_t num_of_lanes, uint32_t bpp); void mdss_dsi_clock_config(void); void mdss_dsi_video_mode_config(struct edid *edid, uint32_t bpp); -cb_err_t mdss_dsi_panel_initialize(const u8 *init_cmds); +enum cb_err mdss_dsi_panel_initialize(const u8 *init_cmds); #endif -- cgit v1.2.3