Skip to content

Commit 8e0e99b

Browse files
ubiedakartben
ubieda
authored and
kartben
committed
sensor: adxl345: Formatting improvements on macrobatics
No functional changes, only formatting changes. Signed-off-by: Luis Ubieda <luisf@croxel.com>
1 parent 9a044aa commit 8e0e99b

File tree

1 file changed

+56
-56
lines changed

1 file changed

+56
-56
lines changed

‎drivers/sensor/adi/adxl345/adxl345.c

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -519,22 +519,22 @@ static int adxl345_init(const struct device *dev)
519519
}
520520

521521
#ifdef CONFIG_ADXL345_TRIGGER
522-
#define ADXL345_CFG_IRQ(inst) \
522+
#define ADXL345_CFG_IRQ(inst) \
523523
.interrupt = GPIO_DT_SPEC_INST_GET(inst, int2_gpios),
524524
#else
525525
#define ADXL345_CFG_IRQ(inst)
526526
#endif /* CONFIG_ADXL345_TRIGGER */
527527

528-
#define ADXL345_RTIO_SPI_DEFINE(inst) \
529-
COND_CODE_1(CONFIG_SPI_RTIO, \
530-
(SPI_DT_IODEV_DEFINE(adxl345_iodev_##inst, DT_DRV_INST(inst), \
531-
SPI_WORD_SET(8) | SPI_TRANSFER_MSB | \
532-
SPI_MODE_CPOL | SPI_MODE_CPHA, 0U);), \
528+
#define ADXL345_RTIO_SPI_DEFINE(inst) \
529+
COND_CODE_1(CONFIG_SPI_RTIO, \
530+
(SPI_DT_IODEV_DEFINE(adxl345_iodev_##inst, DT_DRV_INST(inst), \
531+
SPI_WORD_SET(8) | SPI_TRANSFER_MSB | \
532+
SPI_MODE_CPOL | SPI_MODE_CPHA, 0U);), \
533533
())
534534

535-
#define ADXL345_RTIO_I2C_DEFINE(inst) \
536-
COND_CODE_1(CONFIG_I2C_RTIO, \
537-
(I2C_DT_IODEV_DEFINE(adxl345_iodev_##inst, DT_DRV_INST(inst));), \
535+
#define ADXL345_RTIO_I2C_DEFINE(inst) \
536+
COND_CODE_1(CONFIG_I2C_RTIO, \
537+
(I2C_DT_IODEV_DEFINE(adxl345_iodev_##inst, DT_DRV_INST(inst));), \
538538
())
539539

540540
/** RTIO SQE/CQE pool size depends on the fifo-watermark because we
@@ -544,49 +544,49 @@ static int adxl345_init(const struct device *dev)
544544
* frame, and then end up calling the completion event so the
545545
* application receives it).
546546
*/
547-
#define ADXL345_RTIO_DEFINE(inst) \
548-
/* Conditionally include SPI and/or I2C parts based on their presence */ \
549-
COND_CODE_1(DT_INST_ON_BUS(inst, spi), \
550-
(ADXL345_RTIO_SPI_DEFINE(inst)), \
551-
()) \
552-
COND_CODE_1(DT_INST_ON_BUS(inst, i2c), \
553-
(ADXL345_RTIO_I2C_DEFINE(inst)), \
554-
()) \
547+
#define ADXL345_RTIO_DEFINE(inst) \
548+
/* Conditionally include SPI and/or I2C parts based on their presence */ \
549+
COND_CODE_1(DT_INST_ON_BUS(inst, spi), \
550+
(ADXL345_RTIO_SPI_DEFINE(inst)), \
551+
()) \
552+
COND_CODE_1(DT_INST_ON_BUS(inst, i2c), \
553+
(ADXL345_RTIO_I2C_DEFINE(inst)), \
554+
()) \
555555
RTIO_DEFINE(adxl345_rtio_ctx_##inst, \
556556
2 * DT_INST_PROP(inst, fifo_watermark) + 2, \
557557
2 * DT_INST_PROP(inst, fifo_watermark) + 2);
558558

559-
#define ADXL345_CONFIG(inst) \
560-
.odr = DT_INST_PROP(inst, odr), \
561-
.fifo_config.fifo_mode = ADXL345_FIFO_STREAMED, \
562-
.fifo_config.fifo_trigger = ADXL345_INT2, \
559+
#define ADXL345_CONFIG(inst) \
560+
.odr = DT_INST_PROP(inst, odr), \
561+
.fifo_config.fifo_mode = ADXL345_FIFO_STREAMED, \
562+
.fifo_config.fifo_trigger = ADXL345_INT2, \
563563
.fifo_config.fifo_samples = DT_INST_PROP_OR(inst, fifo_watermark, 0),
564564

565-
#define ADXL345_CONFIG_SPI(inst) \
566-
{ \
567-
.bus = {.spi = SPI_DT_SPEC_INST_GET(inst, \
568-
SPI_WORD_SET(8) | \
569-
SPI_TRANSFER_MSB | \
570-
SPI_MODE_CPOL | \
571-
SPI_MODE_CPHA, \
572-
0)}, \
573-
.bus_is_ready = adxl345_bus_is_ready_spi, \
574-
.reg_access = adxl345_reg_access_spi, \
575-
.bus_type = ADXL345_BUS_SPI, \
576-
ADXL345_CONFIG(inst) \
577-
COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, int2_gpios), \
578-
(ADXL345_CFG_IRQ(inst)), ()) \
565+
#define ADXL345_CONFIG_SPI(inst) \
566+
{ \
567+
.bus = {.spi = SPI_DT_SPEC_INST_GET(inst, \
568+
SPI_WORD_SET(8) | \
569+
SPI_TRANSFER_MSB | \
570+
SPI_MODE_CPOL | \
571+
SPI_MODE_CPHA, \
572+
0)}, \
573+
.bus_is_ready = adxl345_bus_is_ready_spi, \
574+
.reg_access = adxl345_reg_access_spi, \
575+
.bus_type = ADXL345_BUS_SPI, \
576+
ADXL345_CONFIG(inst) \
577+
COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, int2_gpios), \
578+
(ADXL345_CFG_IRQ(inst)), ()) \
579579
}
580580

581-
#define ADXL345_CONFIG_I2C(inst) \
582-
{ \
583-
.bus = {.i2c = I2C_DT_SPEC_INST_GET(inst)}, \
584-
.bus_is_ready = adxl345_bus_is_ready_i2c, \
585-
.reg_access = adxl345_reg_access_i2c, \
586-
.bus_type = ADXL345_BUS_I2C, \
587-
ADXL345_CONFIG(inst) \
588-
COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, int2_gpios), \
589-
(ADXL345_CFG_IRQ(inst)), ()) \
581+
#define ADXL345_CONFIG_I2C(inst) \
582+
{ \
583+
.bus = {.i2c = I2C_DT_SPEC_INST_GET(inst)}, \
584+
.bus_is_ready = adxl345_bus_is_ready_i2c, \
585+
.reg_access = adxl345_reg_access_i2c, \
586+
.bus_type = ADXL345_BUS_I2C, \
587+
ADXL345_CONFIG(inst) \
588+
COND_CODE_1(DT_INST_NODE_HAS_PROP(inst, int2_gpios), \
589+
(ADXL345_CFG_IRQ(inst)), ()) \
590590
}
591591

592592
#define ADXL345_DEFINE(inst) \
@@ -602,17 +602,17 @@ static int adxl345_init(const struct device *dev)
602602
"fifo-watermark must be between 1 and 32. Please set it in " \
603603
"the device-tree node properties"); \
604604
\
605-
IF_ENABLED(CONFIG_ADXL345_STREAM, (ADXL345_RTIO_DEFINE(inst))); \
606-
static struct adxl345_dev_data adxl345_data_##inst = { \
607-
IF_ENABLED(CONFIG_ADXL345_STREAM, (.rtio_ctx = &adxl345_rtio_ctx_##inst, \
608-
.iodev = &adxl345_iodev_##inst,)) \
609-
}; \
610-
static const struct adxl345_dev_config adxl345_config_##inst = \
611-
COND_CODE_1(DT_INST_ON_BUS(inst, spi), (ADXL345_CONFIG_SPI(inst)), \
612-
(ADXL345_CONFIG_I2C(inst))); \
613-
\
614-
SENSOR_DEVICE_DT_INST_DEFINE(inst, adxl345_init, NULL, \
615-
&adxl345_data_##inst, &adxl345_config_##inst, POST_KERNEL,\
616-
CONFIG_SENSOR_INIT_PRIORITY, &adxl345_api_funcs); \
605+
IF_ENABLED(CONFIG_ADXL345_STREAM, (ADXL345_RTIO_DEFINE(inst))); \
606+
static struct adxl345_dev_data adxl345_data_##inst = { \
607+
IF_ENABLED(CONFIG_ADXL345_STREAM, (.rtio_ctx = &adxl345_rtio_ctx_##inst, \
608+
.iodev = &adxl345_iodev_##inst,)) \
609+
}; \
610+
static const struct adxl345_dev_config adxl345_config_##inst = \
611+
COND_CODE_1(DT_INST_ON_BUS(inst, spi), (ADXL345_CONFIG_SPI(inst)), \
612+
(ADXL345_CONFIG_I2C(inst))); \
613+
\
614+
SENSOR_DEVICE_DT_INST_DEFINE(inst, adxl345_init, NULL, \
615+
&adxl345_data_##inst, &adxl345_config_##inst, POST_KERNEL, \
616+
CONFIG_SENSOR_INIT_PRIORITY, &adxl345_api_funcs);
617617

618618
DT_INST_FOREACH_STATUS_OKAY(ADXL345_DEFINE)

0 commit comments

Comments
 (0)