diff --git a/drivers/usb_c/ppc/nxp_nx20p3483.c b/drivers/usb_c/ppc/nxp_nx20p3483.c index 35d1db7079810..f6be9bdaa71ef 100644 --- a/drivers/usb_c/ppc/nxp_nx20p3483.c +++ b/drivers/usb_c/ppc/nxp_nx20p3483.c @@ -229,7 +229,7 @@ static int nx20p3483_dump_regs(const struct device *dev) return 0; } -static struct usbc_ppc_driver_api nx20p3483_driver_api = { +static DEVICE_API(usbc_ppc, nx20p3483_driver_api) = { .is_dead_battery_mode = nx20p3483_is_dead_battery_mode, .exit_dead_battery_mode = nx20p3483_exit_dead_battery_mode, .is_vbus_source = nx20p3483_is_vbus_source, diff --git a/drivers/usb_c/ppc/usbc_ppc_numaker.c b/drivers/usb_c/ppc/usbc_ppc_numaker.c index a55327c639e0d..598792dccbd4b 100644 --- a/drivers/usb_c/ppc/usbc_ppc_numaker.c +++ b/drivers/usb_c/ppc/usbc_ppc_numaker.c @@ -198,7 +198,7 @@ static int numaker_ppc_dump_regs(const struct device *dev) return numaker_tcpc_ppc_dump_regs(tcpc_dev); } -static const struct usbc_ppc_driver_api numaker_ppc_driver_api = { +static DEVICE_API(usbc_ppc, numaker_ppc_driver_api) = { .is_dead_battery_mode = numaker_ppc_is_dead_battery_mode, .exit_dead_battery_mode = numaker_ppc_exit_dead_battery_mode, .is_vbus_source = numaker_ppc_is_vbus_source, diff --git a/drivers/usb_c/tcpc/ps8xxx.c b/drivers/usb_c/tcpc/ps8xxx.c index 933764865e638..70c1d229860f0 100644 --- a/drivers/usb_c/tcpc/ps8xxx.c +++ b/drivers/usb_c/tcpc/ps8xxx.c @@ -543,7 +543,7 @@ int ps8xxx_tcpc_set_alert_handler_cb(const struct device *dev, tcpc_alert_handle /* Functions not assigned to the driver API but used by device */ -static const struct tcpc_driver_api ps8xxx_driver_api = { +static DEVICE_API(tcpc, ps8xxx_driver_api) = { .init = ps8xxx_tcpc_init, .get_cc = ps8xxx_tcpc_get_cc, .select_rp_value = ps8xxx_tcpc_select_rp_value, diff --git a/drivers/usb_c/tcpc/ucpd_numaker.c b/drivers/usb_c/tcpc/ucpd_numaker.c index c628b8604df1c..55daf4e9c5ce0 100644 --- a/drivers/usb_c/tcpc/ucpd_numaker.c +++ b/drivers/usb_c/tcpc/ucpd_numaker.c @@ -2304,7 +2304,7 @@ int numaker_tcpc_vbus_enable(const struct device *dev, bool enable) /* End of "*_tcpc_vbus_*" functions */ -static const struct tcpc_driver_api numaker_tcpc_driver_api = { +static DEVICE_API(tcpc, numaker_tcpc_driver_api) = { .init = numaker_tcpc_init_recycle, .get_cc = numaker_tcpc_get_cc, .select_rp_value = numaker_tcpc_select_rp_value, diff --git a/drivers/usb_c/tcpc/ucpd_stm32.c b/drivers/usb_c/tcpc/ucpd_stm32.c index 2fca84346fc5a..1ad7e081bf752 100644 --- a/drivers/usb_c/tcpc/ucpd_stm32.c +++ b/drivers/usb_c/tcpc/ucpd_stm32.c @@ -1418,7 +1418,7 @@ static int ucpd_init(const struct device *dev) return 0; } -static const struct tcpc_driver_api driver_api = { +static DEVICE_API(tcpc, driver_api) = { .init = ucpd_init, .set_alert_handler_cb = ucpd_set_alert_handler_cb, .get_cc = ucpd_get_cc, diff --git a/drivers/usb_c/vbus/usbc_vbus_adc.c b/drivers/usb_c/vbus/usbc_vbus_adc.c index 1b2d576a3ed96..b83ebd09817e5 100644 --- a/drivers/usb_c/vbus/usbc_vbus_adc.c +++ b/drivers/usb_c/vbus/usbc_vbus_adc.c @@ -191,7 +191,7 @@ static int adc_vbus_init(const struct device *dev) return 0; } -static const struct usbc_vbus_driver_api driver_api = { +static DEVICE_API(usbc_vbus, driver_api) = { .measure = adc_vbus_measure, .check_level = adc_vbus_check_level, .discharge = adc_vbus_discharge, diff --git a/drivers/usb_c/vbus/usbc_vbus_numaker.c b/drivers/usb_c/vbus/usbc_vbus_numaker.c index f8e7d15c6c5bb..aa69e750cd73a 100644 --- a/drivers/usb_c/vbus/usbc_vbus_numaker.c +++ b/drivers/usb_c/vbus/usbc_vbus_numaker.c @@ -110,7 +110,7 @@ static int numaker_vbus_enable(const struct device *dev, bool enable) return numaker_tcpc_vbus_enable(tcpc_dev, enable); } -static const struct usbc_vbus_driver_api numaker_vbus_driver_api = { +static DEVICE_API(usbc_vbus, numaker_vbus_driver_api) = { .check_level = numaker_vbus_check_level, .measure = numaker_vbus_measure, .discharge = numaker_vbus_discharge, diff --git a/drivers/usb_c/vbus/usbc_vbus_tcpci.c b/drivers/usb_c/vbus/usbc_vbus_tcpci.c index a4691efae4669..30745c64bb94d 100644 --- a/drivers/usb_c/vbus/usbc_vbus_tcpci.c +++ b/drivers/usb_c/vbus/usbc_vbus_tcpci.c @@ -80,10 +80,12 @@ static int tcpci_enable(const struct device *dev, bool enable) (enable) ? 0 : TCPC_REG_POWER_CTRL_VBUS_VOL_MONITOR_DIS); } -static const struct usbc_vbus_driver_api vbus_tcpci_api = {.measure = tcpci_measure, - .check_level = tcpci_check_level, - .discharge = tcpci_discharge, - .enable = tcpci_enable}; +static DEVICE_API(usbc_vbus, vbus_tcpci_api) = { + .measure = tcpci_measure, + .check_level = tcpci_check_level, + .discharge = tcpci_discharge, + .enable = tcpci_enable, +}; static int tcpci_init(const struct device *dev) {