drivers/can: Switching CAN_DEVICE_DT_DEFINE macros to new ones

tbursztyka · tbursztyka · commit ce5f327e05fe · 2024-11-26T19:28:08.000+01:00
Switching to CAN_DEVICE_INSTANCE and CAN_DEVICE_INSTANCE_FROM_DT_INST
relevantly.

Signed-off-by: Tomasz Bursztyka &lt;tomasz.bursztyka@proton.me&gt;
diff --git a/drivers/can/can_esp32_twai.c b/drivers/can/can_esp32_twai.c
@@ -296,8 +296,8 @@ const struct can_driver_api can_esp32_twai_driver_api = {
 	static struct can_sja1000_data can_sja1000_data_##inst =                                   \
 		CAN_SJA1000_DATA_INITIALIZER(NULL);                                                \
                                                                                                    \
-	CAN_DEVICE_DT_INST_DEFINE(inst, can_esp32_twai_init, NULL, &can_sja1000_data_##inst,       \
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_esp32_twai_init, NULL, &can_sja1000_data_##inst,\
 				  &can_sja1000_config_##inst, POST_KERNEL,                         \
-				  CONFIG_CAN_INIT_PRIORITY, &can_esp32_twai_driver_api);
+				  &can_esp32_twai_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(CAN_ESP32_TWAI_INIT)
diff --git a/drivers/can/can_fake.c b/drivers/can/can_fake.c
@@ -167,9 +167,8 @@ static const struct can_driver_api fake_can_driver_api = {
 									                \
 	static struct fake_can_data fake_can_data_##inst;		                \
 									                \
-	CAN_DEVICE_DT_INST_DEFINE(inst, fake_can_init, NULL, &fake_can_data_##inst,     \
-				  &fake_can_config_##inst, POST_KERNEL,	                \
-				  CONFIG_CAN_INIT_PRIORITY,                             \
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, fake_can_init, NULL, &fake_can_data_##inst,\
+				  &fake_can_config_##inst, POST_KERNEL,			     \
 				  &fake_can_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(FAKE_CAN_INIT)
diff --git a/drivers/can/can_kvaser_pci.c b/drivers/can/can_kvaser_pci.c
@@ -175,9 +175,9 @@ const struct can_driver_api can_kvaser_pci_driver_api = {
 	static struct can_sja1000_data can_sja1000_data_##inst =                                   \
 		CAN_SJA1000_DATA_INITIALIZER(&can_kvaser_pci_data_##inst);                         \
                                                                                                    \
-	CAN_DEVICE_DT_INST_DEFINE(inst, can_kvaser_pci_init, NULL, &can_sja1000_data_##inst,       \
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_kvaser_pci_init, NULL, &can_sja1000_data_##inst,\
 				  &can_sja1000_config_##inst, POST_KERNEL,                         \
-				  CONFIG_CAN_INIT_PRIORITY, &can_kvaser_pci_driver_api);           \
+				  &can_kvaser_pci_driver_api);                                     \
                                                                                                    \
 	static void can_kvaser_pci_config_func_##inst(const struct device *dev)                    \
 	{                                                                                          \
diff --git a/drivers/can/can_loopback.c b/drivers/can/can_loopback.c
@@ -455,10 +455,9 @@ static int can_loopback_init(const struct device *dev)
 												\
 	static struct can_loopback_data can_loopback_data_##inst;				\
 												\
-	CAN_DEVICE_DT_INST_DEFINE(inst, can_loopback_init, NULL,				\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_loopback_init, NULL,				\
 				  &can_loopback_data_##inst,					\
 				  &can_loopback_config_##inst,					\
-				  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,			\
-				  &can_loopback_driver_api);
+				  POST_KERNEL, &can_loopback_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(CAN_LOOPBACK_INIT)
diff --git a/drivers/can/can_mcp2515.c b/drivers/can/can_mcp2515.c
@@ -1014,8 +1014,7 @@ static int mcp2515_init(const struct device *dev)
 		.osc_freq = DT_INST_PROP(inst, osc_freq),                                          \
 	};                                                                                         \
                                                                                                    \
-	CAN_DEVICE_DT_INST_DEFINE(inst, mcp2515_init, NULL, &mcp2515_data_##inst,                  \
-				  &mcp2515_config_##inst, POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,   \
-				  &can_api_funcs);
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, mcp2515_init, NULL, &mcp2515_data_##inst,           \
+				  &mcp2515_config_##inst, POST_KERNEL, &can_api_funcs);
 
 DT_INST_FOREACH_STATUS_OKAY(MCP2515_INIT)
diff --git a/drivers/can/can_mcp251xfd.c b/drivers/can/can_mcp251xfd.c
@@ -1768,8 +1768,7 @@ static const struct can_driver_api mcp251xfd_api_funcs = {
 		MCP251XFD_SET_CLOCK(inst)                                                          \
 	};                                                                                         \
                                                                                                    \
-	CAN_DEVICE_DT_INST_DEFINE(inst, mcp251xfd_init, NULL, &mcp251xfd_data_##inst,             \
-				  &mcp251xfd_config_##inst, POST_KERNEL, CONFIG_CAN_INIT_PRIORITY, \
-				  &mcp251xfd_api_funcs);
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, mcp251xfd_init, NULL, &mcp251xfd_data_##inst,      \
+				  &mcp251xfd_config_##inst, POST_KERNEL, &mcp251xfd_api_funcs);
 
 DT_INST_FOREACH_STATUS_OKAY(MCP251XFD_INIT)
diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c
@@ -1419,11 +1419,10 @@ static const struct can_driver_api mcux_flexcan_fd_driver_api = {
 									\
 	static struct mcux_flexcan_data mcux_flexcan_data_##id;		\
 									\
-	CAN_DEVICE_DT_INST_DEFINE(id, mcux_flexcan_init,		\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(id, mcux_flexcan_init,		\
 				  NULL, &mcux_flexcan_data_##id,	\
 				  &mcux_flexcan_config_##id,		\
-				  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,\
-				  &FLEXCAN_DRIVER_API(id));		\
+				  POST_KERNEL, &FLEXCAN_DRIVER_API(id));\
 									\
 	static void mcux_flexcan_irq_config_##id(const struct device *dev) \
 	{								\
diff --git a/drivers/can/can_mcux_mcan.c b/drivers/can/can_mcux_mcan.c
@@ -220,12 +220,11 @@ static const struct can_mcan_ops mcux_mcan_ops = {
 	static struct can_mcan_data can_mcan_data_##n =			\
 		CAN_MCAN_DATA_INITIALIZER(NULL);			\
 									\
-	CAN_DEVICE_DT_INST_DEFINE(n, mcux_mcan_init, NULL,		\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(n, mcux_mcan_init, NULL,	\
 				  &can_mcan_data_##n,			\
 				  &can_mcan_config_##n,			\
 				  POST_KERNEL,				\
-				  CONFIG_CAN_INIT_PRIORITY,		\
-				  &mcux_mcan_driver_api);		\
+				  &mcux_mcan_driver_api),		\
 									\
 	static void mcux_mcan_irq_config_##n(const struct device *dev)	\
 	{								\
diff --git a/drivers/can/can_native_linux.c b/drivers/can/can_native_linux.c
@@ -487,11 +487,10 @@ static const struct can_native_linux_config can_native_linux_cfg_##inst = {	\
 										\
 static struct can_native_linux_data can_native_linux_data_##inst;		\
 										\
-CAN_DEVICE_DT_INST_DEFINE(inst, can_native_linux_init, NULL,			\
+CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_native_linux_init, NULL,		\
 			  &can_native_linux_data_##inst,			\
 			  &can_native_linux_cfg_##inst,				\
-			  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,		\
-			  &can_native_linux_driver_api);
+			  POST_KERNEL, &can_native_linux_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(CAN_NATIVE_LINUX_INIT)
 
diff --git a/drivers/can/can_numaker.c b/drivers/can/can_numaker.c
@@ -286,13 +286,12 @@ static const struct can_mcan_ops can_numaker_ops = {
 	static struct can_mcan_data can_mcan_data_##inst =                        \
 		CAN_MCAN_DATA_INITIALIZER(&can_numaker_data_ ## inst);            \
                                                                                   \
-	CAN_DEVICE_DT_INST_DEFINE(inst,                                           \
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst,                                    \
 		can_numaker_init,                                                 \
 		NULL,                                                             \
 		&can_mcan_data_##inst,                                            \
 		&can_mcan_config_##inst,                                          \
 		POST_KERNEL,                                                      \
-		CONFIG_CAN_INIT_PRIORITY,                                         \
-		&can_numaker_driver_api);                                         \
+		&can_numaker_driver_api),                                         \
 
 DT_INST_FOREACH_STATUS_OKAY(CAN_NUMAKER_INIT);
diff --git a/drivers/can/can_nxp_s32_canxl.c b/drivers/can/can_nxp_s32_canxl.c
@@ -1240,13 +1240,12 @@ static const struct can_driver_api can_nxp_s32_driver_api = {
 	{										\
 		return can_nxp_s32_init(dev);						\
 	}										\
-	CAN_DEVICE_DT_INST_DEFINE(n,							\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(n,						\
 				  can_nxp_s32_##n##_init,				\
 				  NULL,							\
 				  &can_nxp_s32_data_##n,				\
 				  &can_nxp_s32_config_##n,				\
 				  POST_KERNEL,						\
-				  CONFIG_CAN_INIT_PRIORITY,				\
 				  &can_nxp_s32_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(CAN_NXP_S32_INIT_DEVICE)
diff --git a/drivers/can/can_rcar.c b/drivers/can/can_rcar.c
@@ -1205,13 +1205,12 @@ static const struct can_driver_api can_rcar_driver_api = {
 	};									\
 	static struct can_rcar_data can_rcar_data_##n;				\
 										\
-	CAN_DEVICE_DT_INST_DEFINE(n, can_rcar_init,				\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(n, can_rcar_init,			\
 				  NULL,						\
 				  &can_rcar_data_##n,				\
 				  &can_rcar_cfg_##n,				\
 				  POST_KERNEL,					\
-				  CONFIG_CAN_INIT_PRIORITY,			\
-				  &can_rcar_driver_api				\
+				  &can_rcar_driver_api,				\
 				  );						\
 	static void can_rcar_##n##_init(const struct device *dev)		\
 	{									\
diff --git a/drivers/can/can_sam.c b/drivers/can/can_sam.c
@@ -194,11 +194,10 @@ static void config_can_##inst##_irq(void)
 		CAN_MCAN_DATA_INITIALIZER(NULL);
 
 #define CAN_SAM_DEVICE_INST(inst)						\
-	CAN_DEVICE_DT_INST_DEFINE(inst, can_sam_init, NULL,			\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_sam_init, NULL,		\
 				  &can_mcan_data_##inst,			\
 				  &can_mcan_cfg_##inst,				\
-				  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,	\
-				  &can_sam_driver_api);
+				  POST_KERNEL, &can_sam_driver_api);
 
 #define CAN_SAM_INST(inst)                                                     \
 	CAN_MCAN_DT_INST_BUILD_ASSERT_MRAM_CFG(inst);                          \
diff --git a/drivers/can/can_sam0.c b/drivers/can/can_sam0.c
@@ -228,11 +228,10 @@ static void config_can_##inst##_irq(void)						\
 		CAN_MCAN_DATA_INITIALIZER(NULL);
 
 #define CAN_SAM0_DEVICE_INST(inst)							\
-	CAN_DEVICE_DT_INST_DEFINE(inst, can_sam0_init, NULL,				\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_sam0_init, NULL,			\
 				  &can_mcan_data_##inst,				\
 				  &can_mcan_cfg_##inst,					\
-				  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,		\
-				  &can_sam0_driver_api);
+				  POST_KERNEL, &can_sam0_driver_api);
 
 #define CAN_SAM0_INST(inst)								\
 	CAN_MCAN_DT_INST_BUILD_ASSERT_MRAM_CFG(inst);					\
diff --git a/drivers/can/can_stm32_bxcan.c b/drivers/can/can_stm32_bxcan.c
@@ -1153,10 +1153,9 @@ static const struct can_stm32_config can_stm32_cfg_##inst = {            \
 static struct can_stm32_data can_stm32_dev_data_##inst;
 
 #define CAN_STM32_DEFINE_INST(inst)                                      \
-CAN_DEVICE_DT_INST_DEFINE(inst, can_stm32_init, NULL,                    \
-			  &can_stm32_dev_data_##inst, &can_stm32_cfg_##inst, \
-			  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,         \
-			  &can_api_funcs);
+CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_stm32_init, NULL,             \
+			  &can_stm32_dev_data_##inst, &can_stm32_cfg_##inst,\
+			  POST_KERNEL, &can_api_funcs);
 
 #define CAN_STM32_INST(inst)      \
 CAN_STM32_IRQ_INST(inst)          \
diff --git a/drivers/can/can_stm32_fdcan.c b/drivers/can/can_stm32_fdcan.c
@@ -604,10 +604,9 @@ static void config_can_##inst##_irq(void)                                      \
 		CAN_MCAN_DATA_INITIALIZER(NULL);
 
 #define CAN_STM32FD_DEVICE_INST(inst)						\
-	CAN_DEVICE_DT_INST_DEFINE(inst, can_stm32fd_init, NULL,			\
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_stm32fd_init, NULL,		\
 				  &can_mcan_data_##inst, &can_mcan_cfg_##inst,	\
-				  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,	\
-				  &can_stm32fd_driver_api);
+				  POST_KERNEL, &can_stm32fd_driver_api);
 
 #define CAN_STM32FD_INST(inst)          \
 CAN_STM32FD_BUILD_ASSERT_MRAM_CFG(inst) \
diff --git a/drivers/can/can_stm32h7_fdcan.c b/drivers/can/can_stm32h7_fdcan.c
@@ -271,11 +271,10 @@ static const struct can_mcan_ops can_stm32h7_ops = {
 	static struct can_mcan_data can_mcan_data_##n =			    \
 		CAN_MCAN_DATA_INITIALIZER(NULL);			    \
 									    \
-	CAN_DEVICE_DT_INST_DEFINE(n, can_stm32h7_init, NULL,		    \
-				  &can_mcan_data_##n,			    \
-				  &can_mcan_cfg_##n,			    \
-				  POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,    \
-				  &can_stm32h7_driver_api);		    \
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(n, can_stm32h7_init, NULL,		    \
+				  &can_mcan_data_##n,				    \
+				  &can_mcan_cfg_##n,				    \
+				  POST_KERNEL, &can_stm32h7_driver_api),	    \
 									    \
 	static void stm32h7_mcan_irq_config_##n(void)			    \
 	{								    \
diff --git a/drivers/can/can_tcan4x5x.c b/drivers/can/can_tcan4x5x.c
@@ -792,8 +792,7 @@ static const struct can_mcan_ops tcan4x5x_ops = {
 	static struct can_mcan_data can_mcan_data_##inst =                                         \
 		CAN_MCAN_DATA_INITIALIZER(&tcan4x5x_data_##inst);                                  \
                                                                                                    \
-	CAN_DEVICE_DT_INST_DEFINE(inst, tcan4x5x_init, NULL, &can_mcan_data_##inst,                \
-				  &can_mcan_config_##inst, POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,  \
-				  &tcan4x5x_driver_api);
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, tcan4x5x_init, NULL, &can_mcan_data_##inst,         \
+				  &can_mcan_config_##inst, POST_KERNEL, &tcan4x5x_driver_api);
 
 DT_INST_FOREACH_STATUS_OKAY(TCAN4X5X_INIT)
diff --git a/drivers/can/can_xmc4xxx.c b/drivers/can/can_xmc4xxx.c
@@ -932,8 +932,8 @@ static const struct can_driver_api can_xmc4xxx_api_funcs = {
 		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst),                                      \
 	};                                                                                         \
                                                                                                    \
-	CAN_DEVICE_DT_INST_DEFINE(inst, can_xmc4xxx_init, NULL, &can_xmc4xxx_data_##inst,          \
+	CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_xmc4xxx_init, NULL, &can_xmc4xxx_data_##inst,   \
 				  &can_xmc4xxx_config_##inst, POST_KERNEL,                         \
-				  CONFIG_CAN_INIT_PRIORITY, &can_xmc4xxx_api_funcs);
+				  &can_xmc4xxx_api_funcs);
 
 DT_INST_FOREACH_STATUS_OKAY(CAN_XMC4XXX_INIT)

Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,8 @@ static const struct can_driver_api fake_can_driver_api = {`
`167`	`167`	`\`
`168`	`168`	`static struct fake_can_data fake_can_data_##inst; \`
`169`	`169`	`\`
`170`		`- CAN_DEVICE_DT_INST_DEFINE(inst, fake_can_init, NULL, &fake_can_data_##inst, \`
`171`		`- &fake_can_config_##inst, POST_KERNEL, \`
`172`		`- CONFIG_CAN_INIT_PRIORITY, \`
	`170`	`+ CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, fake_can_init, NULL, &fake_can_data_##inst,\`
	`171`	`+ &fake_can_config_##inst, POST_KERNEL, \`
`173`	`172`	`&fake_can_driver_api);`
`174`	`173`
`175`	`174`	`DT_INST_FOREACH_STATUS_OKAY(FAKE_CAN_INIT)`
Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,9 @@ const struct can_driver_api can_kvaser_pci_driver_api = {`
`175`	`175`	`static struct can_sja1000_data can_sja1000_data_##inst = \`
`176`	`176`	`CAN_SJA1000_DATA_INITIALIZER(&can_kvaser_pci_data_##inst); \`
`177`	`177`	`\`
`178`		`- CAN_DEVICE_DT_INST_DEFINE(inst, can_kvaser_pci_init, NULL, &can_sja1000_data_##inst, \`
	`178`	`+ CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_kvaser_pci_init, NULL, &can_sja1000_data_##inst,\`
`179`	`179`	`&can_sja1000_config_##inst, POST_KERNEL, \`
`180`		`- CONFIG_CAN_INIT_PRIORITY, &can_kvaser_pci_driver_api); \`
	`180`	`+ &can_kvaser_pci_driver_api); \`
`181`	`181`	`\`
`182`	`182`	`static void can_kvaser_pci_config_func_##inst(const struct device *dev) \`
`183`	`183`	`{ \`
Original file line number	Diff line number	Diff line change
`@@ -455,10 +455,9 @@ static int can_loopback_init(const struct device *dev)`
`455`	`455`	`\`
`456`	`456`	`static struct can_loopback_data can_loopback_data_##inst; \`
`457`	`457`	`\`
`458`		`- CAN_DEVICE_DT_INST_DEFINE(inst, can_loopback_init, NULL, \`
	`458`	`+ CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_loopback_init, NULL, \`
`459`	`459`	`&can_loopback_data_##inst, \`
`460`	`460`	`&can_loopback_config_##inst, \`
`461`		`- POST_KERNEL, CONFIG_CAN_INIT_PRIORITY, \`
`462`		`- &can_loopback_driver_api);`
	`461`	`+ POST_KERNEL, &can_loopback_driver_api);`
`463`	`462`
`464`	`463`	`DT_INST_FOREACH_STATUS_OKAY(CAN_LOOPBACK_INIT)`
Original file line number	Diff line number	Diff line change
`@@ -1419,11 +1419,10 @@ static const struct can_driver_api mcux_flexcan_fd_driver_api = {`
`1419`	`1419`	`\`
`1420`	`1420`	`static struct mcux_flexcan_data mcux_flexcan_data_##id; \`
`1421`	`1421`	`\`
`1422`		`- CAN_DEVICE_DT_INST_DEFINE(id, mcux_flexcan_init, \`
	`1422`	`+ CAN_DEVICE_INSTANCE_FROM_DT_INST(id, mcux_flexcan_init, \`
`1423`	`1423`	`NULL, &mcux_flexcan_data_##id, \`
`1424`	`1424`	`&mcux_flexcan_config_##id, \`
`1425`		`- POST_KERNEL, CONFIG_CAN_INIT_PRIORITY,\`
`1426`		`- &FLEXCAN_DRIVER_API(id)); \`
	`1425`	`+ POST_KERNEL, &FLEXCAN_DRIVER_API(id));\`
`1427`	`1426`	`\`
`1428`	`1427`	`static void mcux_flexcan_irq_config_##id(const struct device *dev) \`
`1429`	`1428`	`{ \`
Original file line number	Diff line number	Diff line change
`@@ -487,11 +487,10 @@ static const struct can_native_linux_config can_native_linux_cfg_##inst = { \`
`487`	`487`	`\`
`488`	`488`	`static struct can_native_linux_data can_native_linux_data_##inst; \`
`489`	`489`	`\`
`490`		`-CAN_DEVICE_DT_INST_DEFINE(inst, can_native_linux_init, NULL, \`
	`490`	`+CAN_DEVICE_INSTANCE_FROM_DT_INST(inst, can_native_linux_init, NULL, \`
`491`	`491`	`&can_native_linux_data_##inst, \`
`492`	`492`	`&can_native_linux_cfg_##inst, \`
`493`		`- POST_KERNEL, CONFIG_CAN_INIT_PRIORITY, \`
`494`		`- &can_native_linux_driver_api);`
	`493`	`+ POST_KERNEL, &can_native_linux_driver_api);`
`495`	`494`
`496`	`495`	`DT_INST_FOREACH_STATUS_OKAY(CAN_NATIVE_LINUX_INIT)`
`497`	`496`