From 90118b265fe8095f70495ef6c7843013253c3fa1 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 28 Apr 2021 12:04:51 +0200 Subject: [PATCH] drivers: spi: remove usage of device_pm_control_nop device_pm_control_nop is now deprecated in favour of NULL. Signed-off-by: Gerard Marull-Paretas --- drivers/spi/spi_dw.c | 8 ++++---- drivers/spi/spi_emul.c | 2 +- drivers/spi/spi_gecko.c | 2 +- drivers/spi/spi_litespi.c | 2 +- drivers/spi/spi_ll_stm32.c | 2 +- drivers/spi/spi_mcux_dspi.c | 2 +- drivers/spi/spi_mcux_flexcomm.c | 2 +- drivers/spi/spi_mcux_lpspi.c | 2 +- drivers/spi/spi_nrfx_spis.c | 2 +- drivers/spi/spi_oc_simple.c | 2 +- drivers/spi/spi_rv32m1_lpspi.c | 2 +- drivers/spi/spi_sam.c | 2 +- drivers/spi/spi_sam0.c | 2 +- drivers/spi/spi_sifive.c | 2 +- drivers/spi/spi_test.c | 2 +- drivers/spi/spi_xec_qmspi.c | 2 +- drivers/spi/spi_xlnx_axi_quadspi.c | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/spi/spi_dw.c b/drivers/spi/spi_dw.c index 09468b14032..9dce6d9c137 100644 --- 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 index 7bd0e399765..302f489997a 100644 --- 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 index 96bbe1153d2..cf20777ca6a 100644 --- 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 index fba0f660f3e..0d274760361 100644 --- 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 index ae60347f1e6..fbb7c8cea8f 100644 --- 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 index c3772ad1b14..c940c8c6d8c 100644 --- 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 index b850dd36cbc..7e4f66272e4 100644 --- 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 index c57c32c7973..faed79c70ab 100644 --- 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 index 5717bb894e2..d1da95c0747 100644 --- 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 index 10de819f93e..6bbdf60201a 100644 --- 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 index 4cbe962fd6e..3492903e65e 100644 --- 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 index 30c46ef77a6..8b440f06d78 100644 --- 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 index 9bbc918d1b4..ff0b35b1da7 100644 --- 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 index d2404b55ad9..9897556d1be 100644 --- 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 index 7fa8c23f5d9..ef069ca5379 100644 --- 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 index fb7eeb6b81b..6dd18d258b8 100644 --- 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 index 64e834c1adf..2e1e990c246 100644 --- 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, \