From 260fc89643fd64b74f9983065867d8b368f81a0d Mon Sep 17 00:00:00 2001 From: Roman Studenikin Date: Wed, 24 Jan 2024 16:06:47 +0000 Subject: [PATCH] drivers: use DT_INST_PROP over DT_INST_PROP_OR if possible It might happens that DT(_INST)_PROP_OR is used with boolean properties. For instance: .single_wire = DT_INST_PROP_OR(index, single_wire, false), \ .tx_rx_swap = DT_INST_PROP_OR(index, tx_rx_swap, false), \ This is not required as boolean properties are generated with false value when not present, so the _OR macro extension is superflous and the above code can be replaced by: .single_wire = DT_INST_PROP(index, single_wire), \ .tx_rx_swap = DT_INST_PROP(index, tx_rx_swap), \ Signed-off-by: Roman Studenikin --- drivers/dai/nxp/sai/sai.c | 2 +- drivers/fuel_gauge/sbs_gauge/sbs_gauge.c | 4 ++-- drivers/i3c/i3c_mcux.c | 6 +++--- drivers/serial/uart_sam0.c | 2 +- drivers/serial/uart_stm32.c | 4 ++-- drivers/spi/spi_ifx_cat1.c | 8 ++++---- subsys/usb/device/class/cdc_acm.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/dai/nxp/sai/sai.c b/drivers/dai/nxp/sai/sai.c index a19bda1218a..3addb5670f2 100644 --- a/drivers/dai/nxp/sai/sai.c +++ b/drivers/dai/nxp/sai/sai.c @@ -887,7 +887,7 @@ static struct sai_config sai_config_##inst = { \ .clk_data = SAI_CLOCK_DATA_DECLARE(inst), \ .rx_fifo_watermark = SAI_RX_FIFO_WATERMARK(inst), \ .tx_fifo_watermark = SAI_TX_FIFO_WATERMARK(inst), \ - .mclk_is_output = DT_INST_PROP_OR(inst, mclk_is_output, false), \ + .mclk_is_output = DT_INST_PROP(inst, mclk_is_output), \ .tx_props = &sai_tx_props_##inst, \ .rx_props = &sai_rx_props_##inst, \ .irq_config = irq_config_##inst, \ diff --git a/drivers/fuel_gauge/sbs_gauge/sbs_gauge.c b/drivers/fuel_gauge/sbs_gauge/sbs_gauge.c index 4c9ba6702aa..79537d2f509 100644 --- a/drivers/fuel_gauge/sbs_gauge/sbs_gauge.c +++ b/drivers/fuel_gauge/sbs_gauge/sbs_gauge.c @@ -311,12 +311,12 @@ static const struct fuel_gauge_driver_api sbs_gauge_driver_api = { /* Conditionally defined battery config based on battery cutoff support */ #define SBS_GAUGE_CONFIG_DEFINE(index) \ - COND_CODE_1(DT_INST_PROP_OR(index, battery_cutoff_support, false), \ + COND_CODE_1(DT_INST_PROP(index, battery_cutoff_support), \ (_SBS_GAUGE_CONFIG_DEFINE(index)), (;)) /* Conditionally get the battery config variable name or NULL based on battery cutoff support */ #define SBS_GAUGE_GET_BATTERY_CONFIG_NAME(index) \ - COND_CODE_1(DT_INST_PROP_OR(index, battery_cutoff_support, false), \ + COND_CODE_1(DT_INST_PROP(index, battery_cutoff_support), \ (&_SBS_GAUGE_BATT_CUTOFF_CFG_VAR_NAME(index)), (NULL)) #define SBS_GAUGE_INIT(index) \ diff --git a/drivers/i3c/i3c_mcux.c b/drivers/i3c/i3c_mcux.c index a9b9ad305f1..4d630ee1519 100644 --- a/drivers/i3c/i3c_mcux.c +++ b/drivers/i3c/i3c_mcux.c @@ -2088,9 +2088,9 @@ static const struct i3c_driver_api mcux_i3c_driver_api = { #define I3C_MCUX_DEVICE(id) \ PINCTRL_DT_INST_DEFINE(id); \ static void mcux_i3c_config_func_##id(const struct device *dev); \ - static struct i3c_device_desc mcux_i3c_device_array_##id[] = \ + static struct i3c_device_desc mcux_i3c_device_array_##id[] = \ I3C_DEVICE_ARRAY_DT_INST(id); \ - static struct i3c_i2c_device_desc mcux_i3c_i2c_device_array_##id[] = \ + static struct i3c_i2c_device_desc mcux_i3c_i2c_device_array_##id[] = \ I3C_I2C_DEVICE_ARRAY_DT_INST(id); \ static const struct mcux_i3c_config mcux_i3c_config_##id = { \ .base = (I3C_Type *) DT_INST_REG_ADDR(id), \ @@ -2104,7 +2104,7 @@ static const struct i3c_driver_api mcux_i3c_driver_api = { .common.dev_list.num_i2c = ARRAY_SIZE(mcux_i3c_i2c_device_array_##id), \ .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(id), \ .disable_open_drain_high_pp = \ - DT_INST_PROP_OR(id, disable_open_drain_high_pp, false), \ + DT_INST_PROP(id, disable_open_drain_high_pp), \ }; \ static struct mcux_i3c_data mcux_i3c_data_##id = { \ .clocks.i3c_od_scl_hz = DT_INST_PROP_OR(id, i3c_od_scl_hz, 0), \ diff --git a/drivers/serial/uart_sam0.c b/drivers/serial/uart_sam0.c index ce1f8ef73c7..35931fe5a17 100644 --- a/drivers/serial/uart_sam0.c +++ b/drivers/serial/uart_sam0.c @@ -1270,7 +1270,7 @@ static void uart_sam0_irq_config_##n(const struct device *dev) \ (DT_INST_PROP(n, txpo) << SERCOM_USART_CTRLA_TXPO_Pos) #define UART_SAM0_SERCOM_COLLISION_DETECT(n) \ - (DT_INST_PROP_OR(n, collision_detection, false)) + (DT_INST_PROP(n, collision_detection)) #ifdef MCLK #define UART_SAM0_CONFIG_DEFN(n) \ diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index 107dd88d7ce..834012ca3c1 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -2345,8 +2345,8 @@ static const struct uart_stm32_config uart_stm32_cfg_##index = { \ .pclken = pclken_##index, \ .pclk_len = DT_INST_NUM_CLOCKS(index), \ .pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(index), \ - .single_wire = DT_INST_PROP_OR(index, single_wire, false), \ - .tx_rx_swap = DT_INST_PROP_OR(index, tx_rx_swap, false), \ + .single_wire = DT_INST_PROP(index, single_wire), \ + .tx_rx_swap = DT_INST_PROP(index, tx_rx_swap), \ .rx_invert = DT_INST_PROP(index, rx_invert), \ .tx_invert = DT_INST_PROP(index, tx_invert), \ .de_enable = DT_INST_PROP(index, de_enable), \ diff --git a/drivers/spi/spi_ifx_cat1.c b/drivers/spi/spi_ifx_cat1.c index ceafe8e6635..c1423a9c6cb 100644 --- a/drivers/spi/spi_ifx_cat1.c +++ b/drivers/spi/spi_ifx_cat1.c @@ -336,13 +336,13 @@ static int ifx_cat1_spi_init(const struct device *dev) .subMode = DT_INST_PROP_OR(n, sub_mode, CY_SCB_SPI_MOTOROLA), \ .oversample = \ DT_INST_PROP_OR(n, oversample, IFX_CAT1_SPI_DEFAULT_OVERSAMPLE), \ - .enableFreeRunSclk = DT_INST_PROP_OR(n, enable_free_run_sclk, false), \ - .enableInputFilter = DT_INST_PROP_OR(n, enable_input_filter, false), \ + .enableFreeRunSclk = DT_INST_PROP(n, enable_free_run_sclk), \ + .enableInputFilter = DT_INST_PROP(n, enable_input_filter), \ .enableMisoLateSample = \ DT_INST_PROP_OR(n, enable_miso_late_sample, true), \ .enableTransferSeperation = \ - DT_INST_PROP_OR(n, enable_transfer_seperation, false), \ - .enableWakeFromSleep = DT_INST_PROP_OR(n, enableWakeFromSleep, false), \ + DT_INST_PROP(n, enable_transfer_seperation), \ + .enableWakeFromSleep = DT_INST_PROP(n, enableWakeFromSleep), \ .ssPolarity = DT_INST_PROP_OR(n, ss_polarity, CY_SCB_SPI_ACTIVE_LOW), \ .rxFifoTriggerLevel = DT_INST_PROP_OR(n, rx_fifo_trigger_level, 0), \ .rxFifoIntEnableMask = DT_INST_PROP_OR(n, rx_fifo_int_enable_mask, 0), \ diff --git a/subsys/usb/device/class/cdc_acm.c b/subsys/usb/device/class/cdc_acm.c index fedccf5fdc0..80e9b561059 100644 --- a/subsys/usb/device/class/cdc_acm.c +++ b/subsys/usb/device/class/cdc_acm.c @@ -1204,7 +1204,7 @@ static const struct uart_driver_api cdc_acm_driver_api = { .line_coding = CDC_ACM_DEFAULT_BAUDRATE, \ .rx_ringbuf = &cdc_acm_rx_rb_##x, \ .tx_ringbuf = &cdc_acm_tx_rb_##x, \ - .flow_ctrl = DT_INST_PROP_OR(x, hw_flow_control, false),\ + .flow_ctrl = DT_INST_PROP(x, hw_flow_control), \ }; #define DT_DRV_COMPAT zephyr_cdc_acm_uart