Skip to content

Commit c68f869

Browse files
committed
driver: Remove some stray __FILE__ macros
Related to #6306
1 parent 61b70c5 commit c68f869

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

components/driver/esp32c3/adc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#include "esp_efuse_rtc_calib.h"
3535
#include "esp_private/gdma.h"
3636

37-
#define ADC_CHECK_RET(fun_ret) ({ \
37+
#define ADC_CHECK_RET(fun_ret) ({ \
3838
if (fun_ret != ESP_OK) { \
39-
ESP_LOGE(ADC_TAG,"%s:%d\n",__FUNCTION__,__LINE__); \
39+
ESP_LOGE(ADC_TAG,"%s(%d)",__FUNCTION__,__LINE__); \
4040
return ESP_FAIL; \
4141
} \
4242
})
@@ -45,7 +45,7 @@ static const char *ADC_TAG = "ADC";
4545

4646
#define ADC_CHECK(a, str, ret_val) ({ \
4747
if (!(a)) { \
48-
ESP_LOGE(ADC_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str); \
48+
ESP_LOGE(ADC_TAG,"%s(%d) :%s", __FUNCTION__, __LINE__, str); \
4949
return (ret_val); \
5050
} \
5151
})

components/driver/esp32c3/rtc_tempsensor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static const char *TAG = "tsens";
3333

3434
#define TSENS_CHECK(res, ret_val) ({ \
3535
if (!(res)) { \
36-
ESP_LOGE(TAG, "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__); \
36+
ESP_LOGE(TAG, "%s(%d)", __FUNCTION__, __LINE__); \
3737
return (ret_val); \
3838
} \
3939
})

components/driver/esp32s2/dac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static const char *DAC_TAG = "DAC";
2929

3030
#define DAC_CHECK(a, str, ret_val) ({ \
3131
if (!(a)) { \
32-
ESP_LOGE(DAC_TAG,"%s:%d (%s):%s", __FILE__, __LINE__, __FUNCTION__, str); \
32+
ESP_LOGE(DAC_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
3333
return (ret_val); \
3434
} \
3535
})

components/touch_element/include/touch_element/touch_element_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C" {
2929

3030
#define TE_CHECK(cond, ret_val) ({ \
3131
if (!(cond)) { \
32-
ESP_LOGE(TE_TAG, "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__); \
32+
ESP_LOGE(TE_TAG, "%s(%d)", __FUNCTION__, __LINE__); \
3333
return (ret_val); \
3434
} \
3535
})

0 commit comments

Comments
 (0)