drivers: spi: remove usage of device_pm_control_nop

gmarull · nashif · commit 90118b265fe8 · 2021-04-28T12:25:39.000-04:00
device_pm_control_nop is now deprecated in favour of NULL.

Signed-off-by: Gerard Marull-Paretas &lt;gerard.marull@nordicsemi.no&gt;
diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c
@@ -557,7 +557,7 @@ const struct spi_dw_config spi_dw_config_0 = {
 	.op_modes = SPI_CTX_RUNTIME_OP_MODE_MASTER
 };
 
-DEVICE_DT_INST_DEFINE(0, spi_dw_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(0, spi_dw_init, NULL,
 		    &spi_dw_data_port_0, &spi_dw_config_0,
 		    POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,
 		    &dw_spi_api);
@@ -620,7 +620,7 @@ static const struct spi_dw_config spi_dw_config_1 = {
 	.op_modes = SPI_CTX_RUNTIME_OP_MODE_MASTER
 };
 
-DEVICE_DT_INST_DEFINE(1, spi_dw_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(1, spi_dw_init, NULL,
 		    &spi_dw_data_port_1, &spi_dw_config_1,
 		    POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,
 		    &dw_spi_api);
@@ -683,7 +683,7 @@ static const struct spi_dw_config spi_dw_config_2 = {
 	.op_modes = SPI_CTX_RUNTIME_OP_MODE_MASTER
 };
 
-DEVICE_DT_INST_DEFINE(2, spi_dw_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(2, spi_dw_init, NULL,
 		    &spi_dw_data_port_2, &spi_dw_config_2,
 		    POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,
 		    &dw_spi_api);
@@ -746,7 +746,7 @@ static const struct spi_dw_config spi_dw_config_3 = {
 	.op_modes = SPI_CTX_RUNTIME_OP_MODE_MASTER
 };
 
-DEVICE_DT_INST_DEFINE(3, spi_dw_init, device_pm_control_nop,
+DEVICE_DT_INST_DEFINE(3, spi_dw_init, NULL,
 		    &spi_dw_data_port_3, &spi_dw_config_3,
 		    POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,
 		    &dw_spi_api);
diff --git a/drivers/spi/spi_emul.c b/drivers/spi/spi_emul.c
@@ -132,7 +132,7 @@ static struct spi_driver_api spi_emul_api = {
 	static struct spi_emul_data spi_emul_data_##n; \
 	DEVICE_DT_INST_DEFINE(n, \
 			    spi_emul_init, \
-			    device_pm_control_nop, \
+			    NULL, \
 			    &spi_emul_data_##n, \
 			    &spi_emul_cfg_##n, \
 			    POST_KERNEL, \
diff --git a/drivers/spi/spi_gecko.c b/drivers/spi/spi_gecko.c
@@ -311,7 +311,7 @@ static struct spi_driver_api spi_gecko_api = {
 	}; \
 	DEVICE_DT_INST_DEFINE(n, \
 			spi_gecko_init, \
-			device_pm_control_nop, \
+			NULL, \
 			&spi_gecko_data_##n, \
 			&spi_gecko_cfg_##n, \
 			POST_KERNEL, \
diff --git a/drivers/spi/spi_litespi.c b/drivers/spi/spi_litespi.c
@@ -177,7 +177,7 @@ static struct spi_driver_api spi_litespi_api = {
 	}; \
 	DEVICE_DT_INST_DEFINE(n, \
 			spi_litespi_init, \
-			device_pm_control_nop, \
+			NULL, \
 			&spi_litespi_data_##n, \
 			&spi_litespi_cfg_##n, \
 			POST_KERNEL, \
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
@@ -931,7 +931,7 @@ static struct spi_stm32_data spi_stm32_dev_data_##id = {		\
 	SPI_DMA_STATUS_SEM(id)						\
 };									\
 									\
-DEVICE_DT_INST_DEFINE(id, &spi_stm32_init, device_pm_control_nop,	\
+DEVICE_DT_INST_DEFINE(id, &spi_stm32_init, NULL,			\
 		    &spi_stm32_dev_data_##id, &spi_stm32_cfg_##id,	\
 		    POST_KERNEL, CONFIG_SPI_INIT_PRIORITY,		\
 		    &api_funcs);					\
diff --git a/drivers/spi/spi_mcux_dspi.c b/drivers/spi/spi_mcux_dspi.c
@@ -306,7 +306,7 @@ static const struct spi_driver_api spi_mcux_driver_api = {
 	};								\
 	DEVICE_DT_INST_DEFINE(id,					\
 			    &spi_mcux_init,				\
-			    device_pm_control_nop,			\
+			    NULL,					\
 			    &spi_mcux_data_##id,			\
 			    &spi_mcux_config_##id,			\
 			    POST_KERNEL,				\
diff --git a/drivers/spi/spi_mcux_flexcomm.c b/drivers/spi/spi_mcux_flexcomm.c
@@ -766,7 +766,7 @@ static void spi_mcux_config_func_##id(const struct device *dev) \
 	};								\
 	DEVICE_DT_INST_DEFINE(id,					\
 			    &spi_mcux_init,				\
-			    device_pm_control_nop,			\
+			    NULL,					\
 			    &spi_mcux_data_##id,			\
 			    &spi_mcux_config_##id,			\
 			    POST_KERNEL,				\
diff --git a/drivers/spi/spi_mcux_lpspi.c b/drivers/spi/spi_mcux_lpspi.c
@@ -303,7 +303,7 @@ static const struct spi_driver_api spi_mcux_driver_api = {
 		SPI_CONTEXT_INIT_SYNC(spi_mcux_data_##n, ctx),		\
 	};								\
 									\
-	DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, device_pm_control_nop,	\
+	DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, NULL,			\
 			    &spi_mcux_data_##n,				\
 			    &spi_mcux_config_##n, POST_KERNEL,		\
 			    CONFIG_KERNEL_INIT_PRIORITY_DEVICE,		\
diff --git a/drivers/spi/spi_nrfx_spis.c b/drivers/spi/spi_nrfx_spis.c
@@ -289,7 +289,7 @@ static int init_spis(const struct device *dev,
 	};								       \
 	DEVICE_DT_DEFINE(SPIS(idx),					       \
 			    spi_##idx##_init,				       \
-			    device_pm_control_nop,			       \
+			    NULL,					       \
 			    &spi_##idx##_data,				       \
 			    &spi_##idx##z_config,			       \
 			    POST_KERNEL,				       \
diff --git a/drivers/spi/spi_oc_simple.c b/drivers/spi/spi_oc_simple.c
@@ -216,7 +216,7 @@ int spi_oc_simple_init(const struct device *dev)
 									\
 	DEVICE_DT_INST_DEFINE(inst,					\
 			    spi_oc_simple_init,				\
-			    device_pm_control_nop,			\
+			    NULL,					\
 			    &spi_oc_simple_data_##inst,			\
 			    &spi_oc_simple_cfg_##inst,			\
 			    POST_KERNEL,				\
diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c
@@ -295,7 +295,7 @@ static const struct spi_driver_api spi_mcux_driver_api = {
 		SPI_CONTEXT_INIT_SYNC(spi_mcux_data_##n, ctx),		\
 	};								\
 									\
-	DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, device_pm_control_nop,	\
+	DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, NULL,			\
 			    &spi_mcux_data_##n,				\
 			    &spi_mcux_config_##n,			\
 			    POST_KERNEL,				\
diff --git a/drivers/spi/spi_sam.c b/drivers/spi/spi_sam.c
@@ -467,7 +467,7 @@ static const struct spi_driver_api spi_sam_driver_api = {
 		SPI_CONTEXT_INIT_LOCK(spi_sam_dev_data_##n, ctx),	\
 		SPI_CONTEXT_INIT_SYNC(spi_sam_dev_data_##n, ctx),	\
 	};								\
-	DEVICE_DT_INST_DEFINE(n, &spi_sam_init, device_pm_control_nop,	\
+	DEVICE_DT_INST_DEFINE(n, &spi_sam_init, NULL,			\
 			    &spi_sam_dev_data_##n,			\
 			    &spi_sam_config_##n, POST_KERNEL,		\
 			    CONFIG_SPI_INIT_PRIORITY, &spi_sam_driver_api);
diff --git a/drivers/spi/spi_sam0.c b/drivers/spi/spi_sam0.c
@@ -764,7 +764,7 @@ static const struct spi_sam0_config spi_sam0_config_##n = {		\
 		SPI_CONTEXT_INIT_LOCK(spi_sam0_dev_data_##n, ctx),	\
 		SPI_CONTEXT_INIT_SYNC(spi_sam0_dev_data_##n, ctx),	\
 	};								\
-	DEVICE_DT_INST_DEFINE(n, &spi_sam0_init, device_pm_control_nop,	\
+	DEVICE_DT_INST_DEFINE(n, &spi_sam0_init, NULL,			\
 			    &spi_sam0_dev_data_##n,			\
 			    &spi_sam0_config_##n, POST_KERNEL,		\
 			    CONFIG_SPI_INIT_PRIORITY,			\
diff --git a/drivers/spi/spi_sifive.c b/drivers/spi/spi_sifive.c
@@ -250,7 +250,7 @@ static struct spi_driver_api spi_sifive_api = {
 	}; \
 	DEVICE_DT_INST_DEFINE(n, \
 			spi_sifive_init, \
-			device_pm_control_nop, \
+			NULL, \
 			&spi_sifive_data_##n, \
 			&spi_sifive_cfg_##n, \
 			POST_KERNEL, \
diff --git a/drivers/spi/spi_test.c b/drivers/spi/spi_test.c
@@ -53,7 +53,7 @@ static int vnd_spi_init(const struct device *dev)
 }
 
 #define VND_SPI_INIT(n)						\
-	DEVICE_DT_INST_DEFINE(n, &vnd_spi_init, device_pm_control_nop,	\
+	DEVICE_DT_INST_DEFINE(n, &vnd_spi_init, NULL,			\
 			      NULL, NULL, POST_KERNEL,			\
 			      CONFIG_KERNEL_INIT_PRIORITY_DEVICE,	\
 			      &vnd_spi_api);
diff --git a/drivers/spi/spi_xec_qmspi.c b/drivers/spi/spi_xec_qmspi.c
@@ -675,7 +675,7 @@ static struct spi_qmspi_data spi_qmspi_0_dev_data = {
 };
 
 DEVICE_DT_INST_DEFINE(0,
-		    &qmspi_init, device_pm_control_nop, &spi_qmspi_0_dev_data,
+		    &qmspi_init, NULL, &spi_qmspi_0_dev_data,
 		    &spi_qmspi_0_config, POST_KERNEL,
 		    CONFIG_SPI_INIT_PRIORITY, &spi_qmspi_driver_api);
 
diff --git a/drivers/spi/spi_xlnx_axi_quadspi.c b/drivers/spi/spi_xlnx_axi_quadspi.c
@@ -478,7 +478,7 @@ static const struct spi_driver_api xlnx_quadspi_driver_api = {
 	};								\
 									\
 	DEVICE_DT_INST_DEFINE(n, &xlnx_quadspi_init,			\
-			    device_pm_control_nop,			\
+			    NULL,					\
 			    &xlnx_quadspi_data_##n,			\
 			    &xlnx_quadspi_config_##n, POST_KERNEL,	\
 			    CONFIG_KERNEL_INIT_PRIORITY_DEVICE,		\

Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ static struct spi_stm32_data spi_stm32_dev_data_##id = { \`
`931`	`931`	`SPI_DMA_STATUS_SEM(id) \`
`932`	`932`	`}; \`
`933`	`933`	`\`
`934`		`-DEVICE_DT_INST_DEFINE(id, &spi_stm32_init, device_pm_control_nop, \`
	`934`	`+DEVICE_DT_INST_DEFINE(id, &spi_stm32_init, NULL, \`
`935`	`935`	`&spi_stm32_dev_data_##id, &spi_stm32_cfg_##id, \`
`936`	`936`	`POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \`
`937`	`937`	`&api_funcs); \`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ static const struct spi_driver_api spi_mcux_driver_api = {`
`303`	`303`	`SPI_CONTEXT_INIT_SYNC(spi_mcux_data_##n, ctx), \`
`304`	`304`	`}; \`
`305`	`305`	`\`
`306`		`- DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, device_pm_control_nop, \`
	`306`	`+ DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, NULL, \`
`307`	`307`	`&spi_mcux_data_##n, \`
`308`	`308`	`&spi_mcux_config_##n, POST_KERNEL, \`
`309`	`309`	`CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ int spi_oc_simple_init(const struct device *dev)`
`216`	`216`	`\`
`217`	`217`	`DEVICE_DT_INST_DEFINE(inst, \`
`218`	`218`	`spi_oc_simple_init, \`
`219`		`- device_pm_control_nop, \`
	`219`	`+ NULL, \`
`220`	`220`	`&spi_oc_simple_data_##inst, \`
`221`	`221`	`&spi_oc_simple_cfg_##inst, \`
`222`	`222`	`POST_KERNEL, \`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ static const struct spi_driver_api spi_mcux_driver_api = {`
`295`	`295`	`SPI_CONTEXT_INIT_SYNC(spi_mcux_data_##n, ctx), \`
`296`	`296`	`}; \`
`297`	`297`	`\`
`298`		`- DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, device_pm_control_nop, \`
	`298`	`+ DEVICE_DT_INST_DEFINE(n, &spi_mcux_init, NULL, \`
`299`	`299`	`&spi_mcux_data_##n, \`
`300`	`300`	`&spi_mcux_config_##n, \`
`301`	`301`	`POST_KERNEL, \`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static int vnd_spi_init(const struct device *dev)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`#define VND_SPI_INIT(n) \`
`56`		`- DEVICE_DT_INST_DEFINE(n, &vnd_spi_init, device_pm_control_nop, \`
	`56`	`+ DEVICE_DT_INST_DEFINE(n, &vnd_spi_init, NULL, \`
`57`	`57`	`NULL, NULL, POST_KERNEL, \`
`58`	`58`	`CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \`
`59`	`59`	`&vnd_spi_api);`
Original file line number	Diff line number	Diff line change
`@@ -478,7 +478,7 @@ static const struct spi_driver_api xlnx_quadspi_driver_api = {`
`478`	`478`	`}; \`
`479`	`479`	`\`
`480`	`480`	`DEVICE_DT_INST_DEFINE(n, &xlnx_quadspi_init, \`
`481`		`- device_pm_control_nop, \`
	`481`	`+ NULL, \`
`482`	`482`	`&xlnx_quadspi_data_##n, \`
`483`	`483`	`&xlnx_quadspi_config_##n, POST_KERNEL, \`
`484`	`484`	`CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \`