drivers: bluetooth: hci: Place API into iterable section

pdgendt · kartben · commit e9e64bab3540 · 2024-11-29T14:49:53.000+01:00
Add wrapper DEVICE_API macro to all bt_hci_driver_api instances.

Signed-off-by: Pieter De Gendt &lt;pieter.degendt@basalte.be&gt;
diff --git a/drivers/bluetooth/hci/h4.c b/drivers/bluetooth/hci/h4.c
@@ -564,7 +564,7 @@ static int h4_setup(const struct device *dev, const struct bt_hci_setup_params *
 }
 #endif
 
-static const struct bt_hci_driver_api h4_driver_api = {
+static DEVICE_API(bt_hci, h4_driver_api) = {
 	.open = h4_open,
 	.send = h4_send,
 #if defined(CONFIG_BT_HCI_SETUP)
diff --git a/drivers/bluetooth/hci/h5.c b/drivers/bluetooth/hci/h5.c
@@ -801,7 +801,7 @@ static int h5_open(const struct device *dev, bt_hci_recv_t recv)
 	return 0;
 }
 
-static const struct bt_hci_driver_api h5_driver_api = {
+static DEVICE_API(bt_hci, h5_driver_api) = {
 	.open = h5_open,
 	.send = h5_queue,
 };
diff --git a/drivers/bluetooth/hci/hci_ambiq.c b/drivers/bluetooth/hci/hci_ambiq.c
@@ -422,7 +422,7 @@ static int bt_apollo_setup(const struct device *dev, const struct bt_hci_setup_p
 	return ret;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open = bt_apollo_open,
 	.close = bt_apollo_close,
 	.send = bt_apollo_send,
diff --git a/drivers/bluetooth/hci/hci_da1469x.c b/drivers/bluetooth/hci/hci_da1469x.c
@@ -495,7 +495,7 @@ static int bt_da1469x_send(const struct device *dev, struct net_buf *buf)
 	return 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open           = bt_da1469x_open,
 	.close          = bt_da1469x_close,
 	.send           = bt_da1469x_send,
diff --git a/drivers/bluetooth/hci/hci_esp32.c b/drivers/bluetooth/hci/hci_esp32.c
@@ -362,7 +362,7 @@ static int bt_esp32_close(const struct device *dev)
 	return 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open           = bt_esp32_open,
 	.send           = bt_esp32_send,
 	.close          = bt_esp32_close,
diff --git a/drivers/bluetooth/hci/hci_ifx_cyw208xx.c b/drivers/bluetooth/hci/hci_ifx_cyw208xx.c
@@ -299,7 +299,7 @@ static int cyw208xx_send(const struct device *dev, struct net_buf *buf)
 	return ret ? -EIO : 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open = cyw208xx_open,
 	.close = cyw208xx_close,
 	.send = cyw208xx_send,
diff --git a/drivers/bluetooth/hci/hci_ifx_psoc6_bless.c b/drivers/bluetooth/hci/hci_ifx_psoc6_bless.c
@@ -265,7 +265,7 @@ static int psoc6_bless_hci_init(const struct device *dev)
 	return 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open = psoc6_bless_open,
 	.send = psoc6_bless_send,
 	.setup = psoc6_bless_setup,
diff --git a/drivers/bluetooth/hci/hci_nxp.c b/drivers/bluetooth/hci/hci_nxp.c
@@ -532,7 +532,7 @@ static int bt_nxp_close(const struct device *dev)
 	return ret;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open = bt_nxp_open,
 	.setup = bt_nxp_setup,
 	.close = bt_nxp_close,
diff --git a/drivers/bluetooth/hci/hci_silabs_efr32.c b/drivers/bluetooth/hci/hci_silabs_efr32.c
@@ -252,7 +252,7 @@ void sl_bt_controller_init(void)
 	/* No extra initialization procedure required */
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open           = slz_bt_open,
 	.send           = slz_bt_send,
 };
diff --git a/drivers/bluetooth/hci/hci_spi_st.c b/drivers/bluetooth/hci/hci_spi_st.c
@@ -693,7 +693,7 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
 	return 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 #if defined(CONFIG_BT_BLUENRG_ACI) && !defined(CONFIG_BT_HCI_RAW)
 	.setup          = bt_spi_bluenrg_setup,
 #endif /* CONFIG_BT_BLUENRG_ACI && !CONFIG_BT_HCI_RAW */
diff --git a/drivers/bluetooth/hci/hci_stm32wb0.c b/drivers/bluetooth/hci/hci_stm32wb0.c
@@ -488,7 +488,7 @@ static int bt_hci_stm32wb0_open(const struct device *dev, bt_hci_recv_t recv)
 	return 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open = bt_hci_stm32wb0_open,
 	.send = bt_hci_stm32wb0_send,
 };
diff --git a/drivers/bluetooth/hci/hci_stm32wba.c b/drivers/bluetooth/hci/hci_stm32wba.c
@@ -474,7 +474,7 @@ static int bt_hci_stm32wba_setup(const struct device *dev,
 }
 #endif /* CONFIG_BT_HCI_SETUP */
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 #if defined(CONFIG_BT_HCI_SETUP)
 	.setup          = bt_hci_stm32wba_setup,
 #endif
diff --git a/drivers/bluetooth/hci/ipc.c b/drivers/bluetooth/hci/ipc.c
@@ -379,7 +379,7 @@ static int bt_ipc_close(const struct device *dev)
 	return 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open		= bt_ipc_open,
 	.close		= bt_ipc_close,
 	.send		= bt_ipc_send,
diff --git a/drivers/bluetooth/hci/ipm_stm32wb.c b/drivers/bluetooth/hci/ipm_stm32wb.c
@@ -618,7 +618,7 @@ static int bt_ipm_close(const struct device *dev)
 }
 #endif /* CONFIG_BT_HCI_HOST */
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open           = bt_ipm_open,
 #ifdef CONFIG_BT_HCI_HOST
 	.close          = bt_ipm_close,
diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c
@@ -420,7 +420,7 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)
 	return 0;
 }
 
-static const struct bt_hci_driver_api drv = {
+static DEVICE_API(bt_hci, drv) = {
 	.open		= bt_spi_open,
 	.send		= bt_spi_send,
 };
diff --git a/drivers/bluetooth/hci/userchan.c b/drivers/bluetooth/hci/userchan.c
@@ -405,7 +405,7 @@ static int uc_open(const struct device *dev, bt_hci_recv_t recv)
 	return 0;
 }
 
-static const struct bt_hci_driver_api uc_drv_api = {
+static DEVICE_API(bt_hci, uc_drv_api) = {
 	.open = uc_open,
 	.send = uc_send,
 };
diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c
@@ -900,7 +900,7 @@ static int hci_driver_close(const struct device *dev)
 	return 0;
 }
 
-static const struct bt_hci_driver_api hci_driver_api = {
+static DEVICE_API(bt_hci, hci_driver_api) = {
 	.open = hci_driver_open,
 	.close	= hci_driver_close,
 	.send = hci_driver_send,
diff --git a/tests/bluetooth/bluetooth/src/bluetooth.c b/tests/bluetooth/bluetooth/src/bluetooth.c
@@ -35,7 +35,7 @@ static int driver_send(const struct device *dev, struct net_buf *buf)
 	return 0;
 }
 
-static const struct bt_hci_driver_api driver_api = {
+static DEVICE_API(bt_hci, driver_api) = {
 	.open = driver_open,
 	.send = driver_send,
 };
diff --git a/tests/bluetooth/hci_prop_evt/src/main.c b/tests/bluetooth/hci_prop_evt/src/main.c
@@ -235,7 +235,7 @@ static int driver_send(const struct device *dev, struct net_buf *buf)
 	return 0;
 }
 
-static const struct bt_hci_driver_api driver_api = {
+static DEVICE_API(bt_hci, driver_api) = {
 	.open = driver_open,
 	.send = driver_send,
 };
diff --git a/tests/bluetooth/hci_uart_async/src/test_hci_uart_async.c b/tests/bluetooth/hci_uart_async/src/test_hci_uart_async.c
@@ -37,7 +37,7 @@ static void serial_vnd_data_callback(const struct device *dev, void *user_data);
 static int drv_send(const struct device *dev, struct net_buf *buf);
 static int drv_open(const struct device *dev, bt_hci_recv_t recv);
 
-static const struct bt_hci_driver_api drv_api = {
+static DEVICE_API(bt_hci, drv_api) = {
 	.open = drv_open,
 	.send = drv_send,
 };
diff --git a/tests/bluetooth/host_long_adv_recv/src/main.c b/tests/bluetooth/host_long_adv_recv/src/main.c
@@ -249,7 +249,7 @@ static int driver_send(const struct device *dev, struct net_buf *buf)
 	return 0;
 }
 
-static const struct bt_hci_driver_api driver_api = {
+static DEVICE_API(bt_hci, driver_api) = {
 	.open = driver_open,
 	.send = driver_send,
 };

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ static int h4_setup(const struct device dev, const struct bt_hci_setup_params `
`564`	`564`	`}`
`565`	`565`	`#endif`
`566`	`566`
`567`		`-static const struct bt_hci_driver_api h4_driver_api = {`
	`567`	`+static DEVICE_API(bt_hci, h4_driver_api) = {`
`568`	`568`	`.open = h4_open,`
`569`	`569`	`.send = h4_send,`
`570`	`570`	`#if defined(CONFIG_BT_HCI_SETUP)`
Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ static int h5_open(const struct device *dev, bt_hci_recv_t recv)`
`801`	`801`	`return 0;`
`802`	`802`	`}`
`803`	`803`
`804`		`-static const struct bt_hci_driver_api h5_driver_api = {`
	`804`	`+static DEVICE_API(bt_hci, h5_driver_api) = {`
`805`	`805`	`.open = h5_open,`
`806`	`806`	`.send = h5_queue,`
`807`	`807`	`};`
Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ static int bt_apollo_setup(const struct device *dev, const struct bt_hci_setup_p`
`422`	`422`	`return ret;`
`423`	`423`	`}`
`424`	`424`
`425`		`-static const struct bt_hci_driver_api drv = {`
	`425`	`+static DEVICE_API(bt_hci, drv) = {`
`426`	`426`	`.open = bt_apollo_open,`
`427`	`427`	`.close = bt_apollo_close,`
`428`	`428`	`.send = bt_apollo_send,`
Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ static int bt_da1469x_send(const struct device dev, struct net_buf buf)`
`495`	`495`	`return 0;`
`496`	`496`	`}`
`497`	`497`
`498`		`-static const struct bt_hci_driver_api drv = {`
	`498`	`+static DEVICE_API(bt_hci, drv) = {`
`499`	`499`	`.open = bt_da1469x_open,`
`500`	`500`	`.close = bt_da1469x_close,`
`501`	`501`	`.send = bt_da1469x_send,`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ static int bt_esp32_close(const struct device *dev)`
`362`	`362`	`return 0;`
`363`	`363`	`}`
`364`	`364`
`365`		`-static const struct bt_hci_driver_api drv = {`
	`365`	`+static DEVICE_API(bt_hci, drv) = {`
`366`	`366`	`.open = bt_esp32_open,`
`367`	`367`	`.send = bt_esp32_send,`
`368`	`368`	`.close = bt_esp32_close,`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ static int cyw208xx_send(const struct device dev, struct net_buf buf)`
`299`	`299`	`return ret ? -EIO : 0;`
`300`	`300`	`}`
`301`	`301`
`302`		`-static const struct bt_hci_driver_api drv = {`
	`302`	`+static DEVICE_API(bt_hci, drv) = {`
`303`	`303`	`.open = cyw208xx_open,`
`304`	`304`	`.close = cyw208xx_close,`
`305`	`305`	`.send = cyw208xx_send,`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ static int psoc6_bless_hci_init(const struct device *dev)`
`265`	`265`	`return 0;`
`266`	`266`	`}`
`267`	`267`
`268`		`-static const struct bt_hci_driver_api drv = {`
	`268`	`+static DEVICE_API(bt_hci, drv) = {`
`269`	`269`	`.open = psoc6_bless_open,`
`270`	`270`	`.send = psoc6_bless_send,`
`271`	`271`	`.setup = psoc6_bless_setup,`
Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ static int bt_nxp_close(const struct device *dev)`
`532`	`532`	`return ret;`
`533`	`533`	`}`
`534`	`534`
`535`		`-static const struct bt_hci_driver_api drv = {`
	`535`	`+static DEVICE_API(bt_hci, drv) = {`
`536`	`536`	`.open = bt_nxp_open,`
`537`	`537`	`.setup = bt_nxp_setup,`
`538`	`538`	`.close = bt_nxp_close,`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ void sl_bt_controller_init(void)`
`252`	`252`	`/* No extra initialization procedure required */`
`253`	`253`	`}`
`254`	`254`
`255`		`-static const struct bt_hci_driver_api drv = {`
	`255`	`+static DEVICE_API(bt_hci, drv) = {`
`256`	`256`	`.open = slz_bt_open,`
`257`	`257`	`.send = slz_bt_send,`
`258`	`258`	`};`
Original file line number	Diff line number	Diff line change
`@@ -693,7 +693,7 @@ static int bt_spi_open(const struct device *dev, bt_hci_recv_t recv)`
`693`	`693`	`return 0;`
`694`	`694`	`}`
`695`	`695`
`696`		`-static const struct bt_hci_driver_api drv = {`
	`696`	`+static DEVICE_API(bt_hci, drv) = {`
`697`	`697`	`#if defined(CONFIG_BT_BLUENRG_ACI) && !defined(CONFIG_BT_HCI_RAW)`
`698`	`698`	`.setup = bt_spi_bluenrg_setup,`
`699`	`699`	`#endif /* CONFIG_BT_BLUENRG_ACI && !CONFIG_BT_HCI_RAW */`