michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ethernet: remove usage of device_pm_control_nop

Browse source 
device_pm_control_nop is now deprecated in favour of NULL.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2021-04-28 10:43:35 +02:00 • committed by Anas Nashif
commit 27ed0fa0c5
13 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/ethernet/dsa_ksz8794.c
View file

@ -1041,7 +1041,7 @@ static struct dsa_context dsa_context = {
DT_LABEL(slave), \ DT_LABEL(slave), \
0, \ 0, \
dsa_port_init, \ dsa_port_init, \
device_pm_control_nop, \ NULL, \
&dsa_context, \ &dsa_context, \
&dsa_0_slave_##slave##_config, \ &dsa_0_slave_##slave##_config, \
CONFIG_ETH_INIT_PRIORITY, \ CONFIG_ETH_INIT_PRIORITY, \

4
drivers/ethernet/eth_e1000.c
View file

@ -324,7 +324,7 @@ static const struct ethernet_api e1000_api = {
ETH_NET_DEVICE_DT_INST_DEFINE(0, ETH_NET_DEVICE_DT_INST_DEFINE(0,
e1000_probe, e1000_probe,
device_pm_control_nop, NULL,
&e1000_dev, &e1000_dev,
NULL, NULL,
CONFIG_ETH_INIT_PRIORITY, CONFIG_ETH_INIT_PRIORITY,
@ -448,7 +448,7 @@ static int ptp_e1000_init(const struct device *port)
} }
DEVICE_DEFINE(e1000_ptp_clock, PTP_CLOCK_NAME, ptp_e1000_init, DEVICE_DEFINE(e1000_ptp_clock, PTP_CLOCK_NAME, ptp_e1000_init,
device_pm_control_nop, &ptp_e1000_context, NULL, POST_KERNEL, NULL, &ptp_e1000_context, NULL, POST_KERNEL,
CONFIG_APPLICATION_INIT_PRIORITY, &api); CONFIG_APPLICATION_INIT_PRIORITY, &api);
#endif /* CONFIG_ETH_E1000_PTP_CLOCK */ #endif /* CONFIG_ETH_E1000_PTP_CLOCK */

2
drivers/ethernet/eth_enc28j60.c
View file

@ -847,7 +847,7 @@ static const struct eth_enc28j60_config eth_enc28j60_0_config = {
}; };
ETH_NET_DEVICE_DT_INST_DEFINE(0, ETH_NET_DEVICE_DT_INST_DEFINE(0,
eth_enc28j60_init, device_pm_control_nop, eth_enc28j60_init, NULL,
&eth_enc28j60_0_runtime, &eth_enc28j60_0_config, &eth_enc28j60_0_runtime, &eth_enc28j60_0_config,
CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU); CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU);

2
drivers/ethernet/eth_enc424j600.c
View file

@ -771,6 +771,6 @@ static const struct enc424j600_config enc424j600_0_config = {
}; };
ETH_NET_DEVICE_DT_INST_DEFINE(0, ETH_NET_DEVICE_DT_INST_DEFINE(0,
enc424j600_init, device_pm_control_nop, enc424j600_init, NULL,
&enc424j600_0_runtime, &enc424j600_0_config, &enc424j600_0_runtime, &enc424j600_0_config,
CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU); CONFIG_ETH_INIT_PRIORITY, &api_funcs, NET_ETH_MTU);

2
drivers/ethernet/eth_gecko.c
View file

@ -668,5 +668,5 @@ static struct eth_gecko_dev_data eth0_data = {
}; };
ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_init, ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_init,
device_pm_control_nop, &eth0_data, &eth0_config, NULL, &eth0_data, &eth0_config,
CONFIG_ETH_INIT_PRIORITY, &eth_api, ETH_GECKO_MTU); CONFIG_ETH_INIT_PRIORITY, &eth_api, ETH_GECKO_MTU);

2
drivers/ethernet/eth_liteeth.c
View file

@ -255,7 +255,7 @@ static const struct ethernet_api eth_api = {
.send = eth_tx .send = eth_tx
}; };
NET_DEVICE_DT_INST_DEFINE(0, eth_initialize, device_pm_control_nop, NET_DEVICE_DT_INST_DEFINE(0, eth_initialize, NULL,
&eth_data, &eth_config, CONFIG_ETH_INIT_PRIORITY, &eth_api, &eth_data, &eth_config, CONFIG_ETH_INIT_PRIORITY, &eth_api,
ETHERNET_L2, NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU); ETHERNET_L2, NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU);

4
drivers/ethernet/eth_mcux.c
View file

@ -237,7 +237,7 @@ out:
#define ETH_MCUX_PM_FUNC eth_mcux_device_pm_control #define ETH_MCUX_PM_FUNC eth_mcux_device_pm_control
#else #else
#define ETH_MCUX_PM_FUNC device_pm_control_nop #define ETH_MCUX_PM_FUNC NULL
#endif /* CONFIG_NET_POWER_MANAGEMENT */ #endif /* CONFIG_NET_POWER_MANAGEMENT */
#if ETH_MCUX_FIXED_LINK #if ETH_MCUX_FIXED_LINK
@ -1536,7 +1536,7 @@ static int ptp_mcux_init(const struct device *port)
} }
DEVICE_DEFINE(mcux_ptp_clock_0, PTP_CLOCK_NAME, ptp_mcux_init, DEVICE_DEFINE(mcux_ptp_clock_0, PTP_CLOCK_NAME, ptp_mcux_init,
device_pm_control_nop, &ptp_mcux_0_context, NULL, POST_KERNEL, NULL, &ptp_mcux_0_context, NULL, POST_KERNEL,
CONFIG_APPLICATION_INIT_PRIORITY, &api); CONFIG_APPLICATION_INIT_PRIORITY, &api);
#endif /* CONFIG_PTP_CLOCK_MCUX */ #endif /* CONFIG_PTP_CLOCK_MCUX */

4
drivers/ethernet/eth_native_posix.c
View file

@ -634,7 +634,7 @@ UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, DEFINE_ETH_DEV_DATA, _)
#define DEFINE_ETH_DEVICE(x, _) \ #define DEFINE_ETH_DEVICE(x, _) \
ETH_NET_DEVICE_INIT(eth_native_posix_##x, \ ETH_NET_DEVICE_INIT(eth_native_posix_##x, \
CONFIG_ETH_NATIVE_POSIX_DRV_NAME #x, \ CONFIG_ETH_NATIVE_POSIX_DRV_NAME #x, \
eth_init, device_pm_control_nop, \ eth_init, NULL, \
&eth_context_data_##x, \ &eth_context_data_##x, \
NULL, \ NULL, \
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \ CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, \
@ -733,7 +733,7 @@ UTIL_LISTIFY(CONFIG_ETH_NATIVE_POSIX_INTERFACE_COUNT, PTP_INIT_FUNC, _)
DEVICE_DEFINE(eth_native_posix_ptp_clock_##x, \ DEVICE_DEFINE(eth_native_posix_ptp_clock_##x, \
PTP_CLOCK_NAME "_" #x, \ PTP_CLOCK_NAME "_" #x, \
ptp_init_##x, \ ptp_init_##x, \
device_pm_control_nop, \ NULL, \
&ptp_context_##x, \ &ptp_context_##x, \
NULL, \ NULL, \
POST_KERNEL, \ POST_KERNEL, \

4
drivers/ethernet/eth_sam_gmac.c
View file

@ -2396,7 +2396,7 @@ static struct eth_sam_dev_data eth0_data = {
}; };
ETH_NET_DEVICE_DT_INST_DEFINE(0, ETH_NET_DEVICE_DT_INST_DEFINE(0,
eth_initialize, device_pm_control_nop, &eth0_data, eth_initialize, NULL, &eth0_data,
&eth0_config, CONFIG_ETH_INIT_PRIORITY, &eth_api, &eth0_config, CONFIG_ETH_INIT_PRIORITY, &eth_api,
GMAC_MTU); GMAC_MTU);
@ -2479,7 +2479,7 @@ static int ptp_gmac_init(const struct device *port)
} }
DEVICE_DEFINE(gmac_ptp_clock_0, PTP_CLOCK_NAME, ptp_gmac_init, DEVICE_DEFINE(gmac_ptp_clock_0, PTP_CLOCK_NAME, ptp_gmac_init,
device_pm_control_nop, &ptp_gmac_0_context, NULL, POST_KERNEL, NULL, &ptp_gmac_0_context, NULL, POST_KERNEL,
CONFIG_APPLICATION_INIT_PRIORITY, &ptp_api); CONFIG_APPLICATION_INIT_PRIORITY, &ptp_api);
#endif /* CONFIG_PTP_CLOCK_SAM_GMAC */ #endif /* CONFIG_PTP_CLOCK_SAM_GMAC */

2
drivers/ethernet/eth_smsc911x.c
View file

@ -679,6 +679,6 @@ int eth_init(const struct device *dev)
static struct eth_context eth_0_context; static struct eth_context eth_0_context;
ETH_NET_DEVICE_DT_INST_DEFINE(0, ETH_NET_DEVICE_DT_INST_DEFINE(0,
eth_init, device_pm_control_nop, &eth_0_context, eth_init, NULL, &eth_0_context,
NULL /*&eth_config_0*/, CONFIG_ETH_INIT_PRIORITY, &api_funcs, NULL /*&eth_config_0*/, CONFIG_ETH_INIT_PRIORITY, &api_funcs,
NET_ETH_MTU /*MTU*/); NET_ETH_MTU /*MTU*/);

2
drivers/ethernet/eth_stellaris.c
View file

@ -348,7 +348,7 @@ static const struct ethernet_api eth_stellaris_apis = {
}; };
NET_DEVICE_DT_INST_DEFINE(0, NET_DEVICE_DT_INST_DEFINE(0,
eth_stellaris_dev_init, device_pm_control_nop, eth_stellaris_dev_init, NULL,
&eth_data, &eth_cfg, CONFIG_ETH_INIT_PRIORITY, &eth_data, &eth_cfg, CONFIG_ETH_INIT_PRIORITY,
&eth_stellaris_apis, ETHERNET_L2, &eth_stellaris_apis, ETHERNET_L2,
NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU); NET_L2_GET_CTX_TYPE(ETHERNET_L2), NET_ETH_MTU);

2
drivers/ethernet/eth_stm32_hal.c
View file

@ -912,5 +912,5 @@ static struct eth_stm32_hal_dev_data eth0_data = {
}; };
ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_initialize, ETH_NET_DEVICE_DT_INST_DEFINE(0, eth_initialize,
device_pm_control_nop, &eth0_data, &eth0_config, NULL, &eth0_data, &eth0_config,
CONFIG_ETH_INIT_PRIORITY, &eth_api, ETH_STM32_HAL_MTU); CONFIG_ETH_INIT_PRIORITY, &eth_api, ETH_STM32_HAL_MTU);

2
drivers/ethernet/eth_w5500.c
View file

@ -589,6 +589,6 @@ static const struct w5500_config w5500_0_config = {
}; };
ETH_NET_DEVICE_DT_INST_DEFINE(0, ETH_NET_DEVICE_DT_INST_DEFINE(0,
w5500_init, device_pm_control_nop, w5500_init, NULL,
&w5500_0_runtime, &w5500_0_config, &w5500_0_runtime, &w5500_0_config,
CONFIG_ETH_INIT_PRIORITY, &w5500_api_funcs, NET_ETH_MTU); CONFIG_ETH_INIT_PRIORITY, &w5500_api_funcs, NET_ETH_MTU);