From 31cdeb538df62cdb47c71305525e99dee714bd1b Mon Sep 17 00:00:00 2001 From: bizhuangyang Date: Mon, 10 May 2021 16:34:20 +0800 Subject: [PATCH] ledc: apply general check macro Standardize LEDC_CHECK() and LEDC_ARG_CHECK() in ledc.c to ESP_RETURN_ON_FALSE() in esp_check.h. --- components/driver/ledc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/components/driver/ledc.c b/components/driver/ledc.c index 80b6c0439b..b8c4c19223 100644 --- a/components/driver/ledc.c +++ b/components/driver/ledc.c @@ -16,6 +16,7 @@ #include "freertos/FreeRTOS.h" #include "freertos/semphr.h" #include "esp_log.h" +#include "esp_check.h" #include "soc/gpio_periph.h" #include "soc/ledc_periph.h" #include "soc/rtc.h" @@ -29,12 +30,8 @@ static const char* LEDC_TAG = "ledc"; -#define LEDC_CHECK(a, str, ret_val) \ - if (!(a)) { \ - ESP_LOGE(LEDC_TAG, "%s(%d): %s", __FUNCTION__, __LINE__, str); \ - return (ret_val); \ - } -#define LEDC_ARG_CHECK(a, param) LEDC_CHECK(a, param " argument is invalid", ESP_ERR_INVALID_ARG) +#define LEDC_CHECK(a, str, ret_val) ESP_RETURN_ON_FALSE(a, ret_val, LEDC_TAG, "%s", str); +#define LEDC_ARG_CHECK(a, param) ESP_RETURN_ON_FALSE(a, ESP_ERR_INVALID_ARG, LEDC_TAG, param " argument is invalid"); typedef struct { ledc_mode_t speed_mode;