Skip to content

SPI: Fix deprecated API usage leftovers from #87427 #96859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 1, 2025
Merged

SPI: Fix deprecated API usage leftovers from #87427 #96859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db81571
drivers: sensor: Fix deprecated SPI_DT_IODEV_DEFINE usage
jhedberg Oct 1, 2025
9b41a7d
include: drivers: spi.h: Fix deprecation support for SPI_DT_IODEV_DEFINE
jhedberg Oct 1, 2025
5f9f818
drivers: Fix deprecated SPI_DT_SPEC_INST_GET usage
jhedberg Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/display/display_lpm013m126.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ static const struct display_driver_api lpm_api = {
static const struct lpm013m126_config lpm_cfg_##inst = { \
.bus = SPI_DT_SPEC_INST_GET(inst, SPI_OP_MODE_MASTER | \
SPI_WORD_SET(8) | \
SPI_TRANSFER_MSB, 0), \
SPI_TRANSFER_MSB), \
.disp_gpio = GPIO_DT_SPEC_INST_GET(inst, disp_gpios), \
.extcomin_gpio = GPIO_DT_SPEC_INST_GET(inst, extcomin_gpios), \
.extcomin_freq = DT_INST_PROP(inst, extcomin_frequency), \
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio_pcal9722.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ static DEVICE_API(gpio, api_table) = {

#define GPIO_PCAL9722_INIT(n) \
static const struct pcal9722_config pcal9722_cfg_##n = { \
.spi = SPI_DT_SPEC_INST_GET(n, SPI_OP_MODE_MASTER | SPI_WORD_SET(8), 0), \
.spi = SPI_DT_SPEC_INST_GET(n, SPI_OP_MODE_MASTER | SPI_WORD_SET(8)), \
.common = \
{ \
.port_pin_mask = GPIO_PORT_PIN_MASK_FROM_DT_INST(n), \
Expand Down
3 changes: 1 addition & 2 deletions drivers/sensor/pni/rm3100/rm3100.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,7 @@ static int rm3100_init(const struct device *dev)
COND_CODE_1(DT_INST_ON_BUS(inst, spi), \
(SPI_DT_IODEV_DEFINE(rm3100_bus_##inst, \
DT_DRV_INST(inst), \
SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_TRANSFER_MSB, \
0U)), \
SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_TRANSFER_MSB)),\
()); \
\
static const struct rm3100_config rm3100_cfg_##inst = { \
Expand Down
5 changes: 2 additions & 3 deletions drivers/sensor/st/iis3dwb/iis3dwb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ static int iis3dwb_init(const struct device *dev)

#define IIS3DWB_SPI_RTIO_DEFINE(inst) \
SPI_DT_IODEV_DEFINE(iis3dwb_iodev_##inst, \
DT_DRV_INST(inst), IIS3DWB_SPI_OPERATION, 0U); \
DT_DRV_INST(inst), IIS3DWB_SPI_OPERATION); \
RTIO_DEFINE(iis3dwb_rtio_ctx_##inst, 8, 8);

#ifdef CONFIG_IIS3DWB_TRIGGER
Expand All @@ -360,8 +360,7 @@ static int iis3dwb_init(const struct device *dev)
{ \
STMEMSC_CTX_SPI(&iis3dwb_config_##inst.stmemsc_cfg), \
.stmemsc_cfg = { \
.spi = SPI_DT_SPEC_INST_GET(inst, \
IIS3DWB_SPI_OPERATION, 0), \
.spi = SPI_DT_SPEC_INST_GET(inst, IIS3DWB_SPI_OPERATION), \
}, \
\
.range = DT_INST_PROP(inst, range), \
Expand Down
2 changes: 1 addition & 1 deletion drivers/sensor/wsen/wsen_isds_2536030320001/wsen_isds_2536030320001.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ static int isds_2536030320001_init(const struct device *dev)
#define ISDS_2536030320001_CONFIG_SPI(inst) \
{.bus_cfg = \
{ \
.spi = SPI_DT_SPEC_INST_GET(inst, ISDS_2536030320001_SPI_OPERATION, 0), \
.spi = SPI_DT_SPEC_INST_GET(inst, ISDS_2536030320001_SPI_OPERATION), \
}, \
ISDS_2536030320001_CONFIG_COMMON(inst)}

Expand Down
4 changes: 2 additions & 2 deletions include/zephyr/drivers/spi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,9 +1361,9 @@ extern const struct rtio_iodev_api spi_iodev_api;
* @param node_id Devicetree node identifier
* @param operation_ SPI operational mode
*/
#define SPI_DT_IODEV_DEFINE(name, node_id, operation_) \
#define SPI_DT_IODEV_DEFINE(name, node_id, operation_, ...) \
const struct spi_dt_spec _spi_dt_spec_##name = \
SPI_DT_SPEC_GET(node_id, operation_); \
SPI_DT_SPEC_GET(node_id, operation_, __VA_ARGS__); \
RTIO_IODEV_DEFINE(name, &spi_iodev_api, (void *)&_spi_dt_spec_##name)

/**
Expand Down