Signed-off-by: Kuninori Morimoto <kuninori.morimoto...@renesas.com> --- drivers/accel/habanalabs/gaudi/gaudi.c | 12 ++++++------ drivers/accel/habanalabs/gaudi/gaudi_coresight.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/accel/habanalabs/gaudi/gaudi.c b/drivers/accel/habanalabs/gaudi/gaudi.c index fa893a9b826e..05d7b15bca28 100644 --- a/drivers/accel/habanalabs/gaudi/gaudi.c +++ b/drivers/accel/habanalabs/gaudi/gaudi.c @@ -8037,7 +8037,7 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask_arr, u8 mask_ set_bit(GAUDI_ENGINE_ID_DMA_0 + dma_id, mask); if (e) hl_engine_data_sprintf(e, fmt, dma_id, - is_eng_idle ? "Y" : "N", qm_glbl_sts0, + str_Y_N(is_eng_idle), qm_glbl_sts0, qm_cgm_sts, dma_core_sts0); } @@ -8059,7 +8059,7 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask_arr, u8 mask_ set_bit(GAUDI_ENGINE_ID_TPC_0 + i, mask); if (e) hl_engine_data_sprintf(e, fmt, i, - is_eng_idle ? "Y" : "N", + str_Y_N(is_eng_idle), qm_glbl_sts0, qm_cgm_sts, tpc_cfg_sts); } @@ -8088,11 +8088,11 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask_arr, u8 mask_ if (e) { if (!is_slave) hl_engine_data_sprintf(e, fmt, i, - is_eng_idle ? "Y" : "N", + str_Y_N(is_eng_idle), qm_glbl_sts0, qm_cgm_sts, mme_arch_sts); else hl_engine_data_sprintf(e, mme_slave_fmt, i, - is_eng_idle ? "Y" : "N", "-", + str_Y_N(is_eng_idle), "-", "-", mme_arch_sts); } } @@ -8115,7 +8115,7 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask_arr, u8 mask_ set_bit(GAUDI_ENGINE_ID_NIC_0 + port, mask); if (e) hl_engine_data_sprintf(e, nic_fmt, port, - is_eng_idle ? "Y" : "N", + str_Y_N(is_eng_idle), qm_glbl_sts0, qm_cgm_sts); } @@ -8130,7 +8130,7 @@ static bool gaudi_is_device_idle(struct hl_device *hdev, u64 *mask_arr, u8 mask_ set_bit(GAUDI_ENGINE_ID_NIC_0 + port, mask); if (e) hl_engine_data_sprintf(e, nic_fmt, port, - is_eng_idle ? "Y" : "N", + str_Y_N(is_eng_idle), qm_glbl_sts0, qm_cgm_sts); } } diff --git a/drivers/accel/habanalabs/gaudi/gaudi_coresight.c b/drivers/accel/habanalabs/gaudi/gaudi_coresight.c index 1168fefa33f4..3497768ffc0f 100644 --- a/drivers/accel/habanalabs/gaudi/gaudi_coresight.c +++ b/drivers/accel/habanalabs/gaudi/gaudi_coresight.c @@ -497,7 +497,7 @@ static int gaudi_config_etf(struct hl_device *hdev, if (rc) { dev_err(hdev->dev, "Failed to %s ETF on timeout, error %d\n", - params->enable ? "enable" : "disable", rc); + str_enable_disable(params->enable), rc); return rc; } @@ -505,7 +505,7 @@ static int gaudi_config_etf(struct hl_device *hdev, if (rc) { dev_err(hdev->dev, "Failed to %s ETF on timeout, error %d\n", - params->enable ? "enable" : "disable", rc); + str_enable_disable(params->enable), rc); return rc; } @@ -601,14 +601,14 @@ static int gaudi_config_etr(struct hl_device *hdev, rc = gaudi_coresight_timeout(hdev, mmPSOC_ETR_FFCR, 6, false); if (rc) { dev_err(hdev->dev, "Failed to %s ETR on timeout, error %d\n", - params->enable ? "enable" : "disable", rc); + str_enable_disable(params->enable), rc); return rc; } rc = gaudi_coresight_timeout(hdev, mmPSOC_ETR_STS, 2, true); if (rc) { dev_err(hdev->dev, "Failed to %s ETR on timeout, error %d\n", - params->enable ? "enable" : "disable", rc); + str_enable_disable(params->enable), rc); return rc; } -- 2.43.0