patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers: can: 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:09:53 +02:00 committed by Anas Nashif
parent 173dc5ef84
commit 51574420fe
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/can/can_loopback.c
View file

@ -293,7 +293,7 @@ static int can_loopback_init(const struct device *dev)
static struct can_loopback_data can_loopback_dev_data_1;
DEVICE_DEFINE(can_loopback_1, CONFIG_CAN_LOOPBACK_DEV_NAME,
&can_loopback_init, device_pm_control_nop,
&can_loopback_init, NULL,
&can_loopback_dev_data_1, NULL,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&can_api_funcs);
@ -327,7 +327,7 @@ static int socket_can_init_1(const struct device *dev)
}
NET_DEVICE_INIT(socket_can_loopback_1, SOCKET_CAN_NAME_1, socket_can_init_1,
device_pm_control_nop, &socket_can_context_1, NULL,
NULL, &socket_can_context_1, NULL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&socket_can_api,
CANBUS_RAW_L2, NET_L2_GET_CTX_TYPE(CANBUS_RAW_L2), CAN_MTU);

4
drivers/can/can_mcp2515.c
View file

@ -970,7 +970,7 @@ static const struct mcp2515_config mcp2515_config_1 = {
.sample_point = DT_INST_PROP_OR(0, sample_point, 0)
};
DEVICE_DT_INST_DEFINE(0, &mcp2515_init, device_pm_control_nop,
DEVICE_DT_INST_DEFINE(0, &mcp2515_init, NULL,
&mcp2515_data_1, &mcp2515_config_1, POST_KERNEL,
CONFIG_CAN_MCP2515_INIT_PRIORITY, &can_api_funcs);
@ -1002,7 +1002,7 @@ static int socket_can_init(const struct device *dev)
}
NET_DEVICE_INIT(socket_can_mcp2515_1, SOCKET_CAN_NAME_1, socket_can_init,
device_pm_control_nop, &socket_can_context_1, NULL,
NULL, &socket_can_context_1, NULL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&socket_can_api,
CANBUS_RAW_L2, NET_L2_GET_CTX_TYPE(CANBUS_RAW_L2), CAN_MTU);

4
drivers/can/can_mcux_flexcan.c
View file

@ -794,7 +794,7 @@ static const struct can_driver_api mcux_flexcan_driver_api = {
static struct mcux_flexcan_data mcux_flexcan_data_##id; \
\
DEVICE_DT_INST_DEFINE(id, &mcux_flexcan_init, \
device_pm_control_nop, &mcux_flexcan_data_##id, \
NULL, &mcux_flexcan_data_##id, \
&mcux_flexcan_config_##id, POST_KERNEL, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \
&mcux_flexcan_driver_api); \
@ -835,7 +835,7 @@ DT_INST_FOREACH_STATUS_OKAY(FLEXCAN_DEVICE_INIT_MCUX)
} \
\
NET_DEVICE_INIT(socket_can_flexcan_##id, SOCKET_CAN_NAME_##id, \
socket_can_init_##id, device_pm_control_nop, \
socket_can_init_##id, NULL, \
&socket_can_context_##id, NULL, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &socket_can_api, \
CANBUS_RAW_L2, NET_L2_GET_CTX_TYPE(CANBUS_RAW_L2), \

2
drivers/can/can_net.c
View file

@ -401,7 +401,7 @@ static int net_can_init(const struct device *dev)
static struct net_can_context net_can_context_1;
NET_DEVICE_INIT(net_can_1, CONFIG_CAN_NET_NAME, net_can_init,
device_pm_control_nop, &net_can_context_1, NULL,
NULL, &net_can_context_1, NULL,
CONFIG_CAN_NET_INIT_PRIORITY,
&net_can_api_inst,
CANBUS_L2, NET_L2_GET_CTX_TYPE(CANBUS_L2), NET_CAN_MTU);

8
drivers/can/can_stm32.c
View file

@ -1150,7 +1150,7 @@ static const struct can_stm32_config can_stm32_cfg_1 = {
static struct can_stm32_data can_stm32_dev_data_1;
DEVICE_DT_DEFINE(DT_NODELABEL(can1), &can_stm32_init, device_pm_control_nop,
DEVICE_DT_DEFINE(DT_NODELABEL(can1), &can_stm32_init, NULL,
&can_stm32_dev_data_1, &can_stm32_cfg_1,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&can_api_funcs);
@ -1212,7 +1212,7 @@ static int socket_can_init_1(const struct device *dev)
}
NET_DEVICE_INIT(socket_can_stm32_1, SOCKET_CAN_NAME_1, socket_can_init_1,
device_pm_control_nop, &socket_can_context_1, NULL,
NULL, &socket_can_context_1, NULL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&socket_can_api,
CANBUS_RAW_L2, NET_L2_GET_CTX_TYPE(CANBUS_RAW_L2), CAN_MTU);
@ -1249,7 +1249,7 @@ static const struct can_stm32_config can_stm32_cfg_2 = {
static struct can_stm32_data can_stm32_dev_data_2;
DEVICE_DT_DEFINE(DT_NODELABEL(can2), &can_stm32_init, device_pm_control_nop,
DEVICE_DT_DEFINE(DT_NODELABEL(can2), &can_stm32_init, NULL,
&can_stm32_dev_data_2, &can_stm32_cfg_2,
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&can_api_funcs);
@ -1304,7 +1304,7 @@ static int socket_can_init_2(const struct device *dev)
}
NET_DEVICE_INIT(socket_can_stm32_2, SOCKET_CAN_NAME_2, socket_can_init_2,
device_pm_control_nop, &socket_can_context_2, NULL,
NULL, &socket_can_context_2, NULL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
&socket_can_api,
CANBUS_RAW_L2, NET_L2_GET_CTX_TYPE(CANBUS_RAW_L2), CAN_MTU);