From ed4dd0e9bb5c8d69ed3e9442aef03d412ae91ca6 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Wed, 28 Apr 2021 11:05:54 +0200 Subject: [PATCH] drivers: ieee802154: 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/ieee802154/ieee802154_cc1200.c | 2 +- drivers/ieee802154/ieee802154_cc13xx_cc26xx.c | 4 ++-- drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c | 4 ++-- drivers/ieee802154/ieee802154_cc2520.c | 6 +++--- drivers/ieee802154/ieee802154_dw1000.c | 4 ++-- drivers/ieee802154/ieee802154_kw41z.c | 2 +- drivers/ieee802154/ieee802154_mcr20a.c | 4 ++-- drivers/ieee802154/ieee802154_nrf5.c | 4 ++-- drivers/ieee802154/ieee802154_rf2xx.c | 4 ++-- drivers/ieee802154/ieee802154_uart_pipe.c | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/ieee802154/ieee802154_cc1200.c b/drivers/ieee802154/ieee802154_cc1200.c index b15add2f839..87b50f848fc 100644 --- a/drivers/ieee802154/ieee802154_cc1200.c +++ b/drivers/ieee802154/ieee802154_cc1200.c @@ -856,7 +856,7 @@ static struct ieee802154_radio_api cc1200_radio_api = { }; NET_DEVICE_INIT(cc1200, CONFIG_IEEE802154_CC1200_DRV_NAME, - cc1200_init, device_pm_control_nop, + cc1200_init, NULL, &cc1200_context_data, NULL, CONFIG_IEEE802154_CC1200_INIT_PRIO, &cc1200_radio_api, IEEE802154_L2, diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c index 15e31a18398..49d78f94b58 100644 --- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c +++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx.c @@ -761,7 +761,7 @@ static struct ieee802154_cc13xx_cc26xx_data ieee802154_cc13xx_cc26xx_data = { #if defined(CONFIG_NET_L2_IEEE802154) NET_DEVICE_INIT(ieee802154_cc13xx_cc26xx, CONFIG_IEEE802154_CC13XX_CC26XX_DRV_NAME, - ieee802154_cc13xx_cc26xx_init, device_pm_control_nop, + ieee802154_cc13xx_cc26xx_init, NULL, &ieee802154_cc13xx_cc26xx_data, NULL, CONFIG_IEEE802154_CC13XX_CC26XX_INIT_PRIO, &ieee802154_cc13xx_cc26xx_radio_api, IEEE802154_L2, @@ -769,7 +769,7 @@ NET_DEVICE_INIT(ieee802154_cc13xx_cc26xx, #else DEVICE_DEFINE(ieee802154_cc13xx_cc26xx, CONFIG_IEEE802154_CC13XX_CC26XX_DRV_NAME, - ieee802154_cc13xx_cc26xx_init, device_pm_control_nop, + ieee802154_cc13xx_cc26xx_init, NULL, &ieee802154_cc13xx_cc26xx_data, NULL, POST_KERNEL, CONFIG_IEEE802154_CC13XX_CC26XX_INIT_PRIO, &ieee802154_cc13xx_cc26xx_radio_api); diff --git a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c index 8e753880b71..04af3d1a633 100644 --- a/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c +++ b/drivers/ieee802154/ieee802154_cc13xx_cc26xx_subg.c @@ -759,7 +759,7 @@ static struct ieee802154_cc13xx_cc26xx_subg_data #if defined(CONFIG_NET_L2_IEEE802154_SUB_GHZ) NET_DEVICE_INIT(ieee802154_cc13xx_cc26xx_subg, CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_DRV_NAME, - ieee802154_cc13xx_cc26xx_subg_init, device_pm_control_nop, + ieee802154_cc13xx_cc26xx_subg_init, NULL, &ieee802154_cc13xx_cc26xx_subg_data, NULL, CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_INIT_PRIO, &ieee802154_cc13xx_cc26xx_subg_radio_api, IEEE802154_L2, @@ -768,7 +768,7 @@ NET_DEVICE_INIT(ieee802154_cc13xx_cc26xx_subg, DEVICE_DEFINE(ieee802154_cc13xx_cc26xx_subg, CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_DRV_NAME, ieee802154_cc13xx_cc26xx_subg_init, - device_pm_control_nop, + NULL, &ieee802154_cc13xx_cc26xx_subg_data, NULL, POST_KERNEL, CONFIG_IEEE802154_CC13XX_CC26XX_SUB_GHZ_INIT_PRIO, &ieee802154_cc13xx_cc26xx_subg_radio_api); diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c index 59746b6da8a..88db9fa8662 100644 --- a/drivers/ieee802154/ieee802154_cc2520.c +++ b/drivers/ieee802154/ieee802154_cc2520.c @@ -1151,12 +1151,12 @@ static struct ieee802154_radio_api cc2520_radio_api = { #if defined(CONFIG_IEEE802154_RAW_MODE) DEVICE_DEFINE(cc2520, CONFIG_IEEE802154_CC2520_DRV_NAME, - cc2520_init, device_pm_control_nop, &cc2520_context_data, NULL, + cc2520_init, NULL, &cc2520_context_data, NULL, POST_KERNEL, CONFIG_IEEE802154_CC2520_INIT_PRIO, &cc2520_radio_api); #else NET_DEVICE_INIT(cc2520, CONFIG_IEEE802154_CC2520_DRV_NAME, - cc2520_init, device_pm_control_nop, + cc2520_init, NULL, &cc2520_context_data, NULL, CONFIG_IEEE802154_CC2520_INIT_PRIO, &cc2520_radio_api, IEEE802154_L2, @@ -1486,7 +1486,7 @@ struct crypto_driver_api cc2520_crypto_api = { }; DEVICE_DEFINE(cc2520_crypto, CONFIG_IEEE802154_CC2520_CRYPTO_DRV_NAME, - cc2520_crypto_init, device_pm_control_nop, + cc2520_crypto_init, NULL, &cc2520_context_data, NULL, POST_KERNEL, CONFIG_IEEE802154_CC2520_CRYPTO_INIT_PRIO, &cc2520_crypto_api); diff --git a/drivers/ieee802154/ieee802154_dw1000.c b/drivers/ieee802154/ieee802154_dw1000.c index f8fdc9d4b07..196a018816f 100644 --- a/drivers/ieee802154/ieee802154_dw1000.c +++ b/drivers/ieee802154/ieee802154_dw1000.c @@ -1667,14 +1667,14 @@ static struct ieee802154_radio_api dwt_radio_api = { #define DWT_PSDU_LENGTH (127 - DWT_FCS_LENGTH) #if defined(CONFIG_IEEE802154_RAW_MODE) -DEVICE_DT_INST_DEFINE(0, dw1000_init, device_pm_control_nop, +DEVICE_DT_INST_DEFINE(0, dw1000_init, NULL, &dwt_0_context, &dw1000_0_config, POST_KERNEL, CONFIG_IEEE802154_DW1000_INIT_PRIO, &dwt_radio_api); #else NET_DEVICE_DT_INST_DEFINE(0, dw1000_init, - device_pm_control_nop, + NULL, &dwt_0_context, &dw1000_0_config, CONFIG_IEEE802154_DW1000_INIT_PRIO, diff --git a/drivers/ieee802154/ieee802154_kw41z.c b/drivers/ieee802154/ieee802154_kw41z.c index 929b610058c..ac78aeefce2 100644 --- a/drivers/ieee802154/ieee802154_kw41z.c +++ b/drivers/ieee802154/ieee802154_kw41z.c @@ -1115,7 +1115,7 @@ NET_DEVICE_INIT( kw41z, /* Device Name */ CONFIG_IEEE802154_KW41Z_DRV_NAME, /* Driver Name */ kw41z_init, /* Initialization Function */ - device_pm_control_nop, /* No PM API support */ + NULL, /* No PM API support */ &kw41z_context_data, /* Context data */ NULL, /* Configuration info */ CONFIG_IEEE802154_KW41Z_INIT_PRIO, /* Initial priority */ diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c index d44cbba68d2..a123fa8fc13 100644 --- a/drivers/ieee802154/ieee802154_mcr20a.c +++ b/drivers/ieee802154/ieee802154_mcr20a.c @@ -1478,12 +1478,12 @@ static struct ieee802154_radio_api mcr20a_radio_api = { #if defined(CONFIG_IEEE802154_RAW_MODE) DEVICE_DEFINE(mcr20a, CONFIG_IEEE802154_MCR20A_DRV_NAME, - mcr20a_init, device_pm_control_nop, &mcr20a_context_data, NULL, + mcr20a_init, NULL, &mcr20a_context_data, NULL, POST_KERNEL, CONFIG_IEEE802154_MCR20A_INIT_PRIO, &mcr20a_radio_api); #else NET_DEVICE_INIT(mcr20a, CONFIG_IEEE802154_MCR20A_DRV_NAME, - mcr20a_init, device_pm_control_nop, &mcr20a_context_data, NULL, + mcr20a_init, NULL, &mcr20a_context_data, NULL, CONFIG_IEEE802154_MCR20A_INIT_PRIO, &mcr20a_radio_api, IEEE802154_L2, NET_L2_GET_CTX_TYPE(IEEE802154_L2), diff --git a/drivers/ieee802154/ieee802154_nrf5.c b/drivers/ieee802154/ieee802154_nrf5.c index 7bc8a33a1a1..521070e673c 100644 --- a/drivers/ieee802154/ieee802154_nrf5.c +++ b/drivers/ieee802154/ieee802154_nrf5.c @@ -849,13 +849,13 @@ static struct ieee802154_radio_api nrf5_radio_api = { #if defined(CONFIG_NET_L2_IEEE802154) || defined(CONFIG_NET_L2_OPENTHREAD) NET_DEVICE_INIT(nrf5_154_radio, CONFIG_IEEE802154_NRF5_DRV_NAME, - nrf5_init, device_pm_control_nop, &nrf5_data, &nrf5_radio_cfg, + nrf5_init, NULL, &nrf5_data, &nrf5_radio_cfg, CONFIG_IEEE802154_NRF5_INIT_PRIO, &nrf5_radio_api, L2, L2_CTX_TYPE, MTU); #else DEVICE_DEFINE(nrf5_154_radio, CONFIG_IEEE802154_NRF5_DRV_NAME, - nrf5_init, device_pm_control_nop, &nrf5_data, &nrf5_radio_cfg, + nrf5_init, NULL, &nrf5_data, &nrf5_radio_cfg, POST_KERNEL, CONFIG_IEEE802154_NRF5_INIT_PRIO, &nrf5_radio_api); #endif diff --git a/drivers/ieee802154/ieee802154_rf2xx.c b/drivers/ieee802154/ieee802154_rf2xx.c index eba58fd7fb8..7fb9273bbed 100644 --- a/drivers/ieee802154/ieee802154_rf2xx.c +++ b/drivers/ieee802154/ieee802154_rf2xx.c @@ -953,7 +953,7 @@ static struct ieee802154_radio_api rf2xx_radio_api = { DEVICE_DT_INST_DEFINE( \ n, \ &rf2xx_init, \ - device_pm_control_nop, \ + NULL, \ &rf2xx_ctx_data_##n, \ &rf2xx_ctx_config_##n, \ POST_KERNEL, \ @@ -964,7 +964,7 @@ static struct ieee802154_radio_api rf2xx_radio_api = { NET_DEVICE_DT_INST_DEFINE( \ n, \ &rf2xx_init, \ - device_pm_control_nop, \ + NULL, \ &rf2xx_ctx_data_##n, \ &rf2xx_ctx_config_##n, \ CONFIG_IEEE802154_RF2XX_INIT_PRIO, \ diff --git a/drivers/ieee802154/ieee802154_uart_pipe.c b/drivers/ieee802154/ieee802154_uart_pipe.c index 0b44f853acc..d25c62720ec 100644 --- a/drivers/ieee802154/ieee802154_uart_pipe.c +++ b/drivers/ieee802154/ieee802154_uart_pipe.c @@ -392,7 +392,7 @@ static struct ieee802154_radio_api upipe_radio_api = { }; NET_DEVICE_INIT(upipe_15_4, CONFIG_IEEE802154_UPIPE_DRV_NAME, - upipe_init, device_pm_control_nop, + upipe_init, NULL, &upipe_context_data, NULL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &upipe_radio_api, IEEE802154_L2,