michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: use pm_action_cb instead of pm_control_cb

Browse source 
The PM action callback is no longer called pm_control_cb but
pm_action_cb.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2021-11-02 16:27:37 +01:00 • committed by Anas Nashif
commit 39abbf64f7
3 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/net/ethernet.h
View file

@ -827,9 +827,9 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
#if defined(CONFIG_NET_VLAN) #if defined(CONFIG_NET_VLAN)
#define Z_ETH_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \ #define Z_ETH_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, api, mtu) \ pm_action_cb, data, cfg, prio, api, mtu) \
Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \ Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, POST_KERNEL, \ pm_action_cb, data, cfg, POST_KERNEL, \
prio, api); \ prio, api); \
NET_L2_DATA_INIT(dev_name, 0, NET_L2_GET_CTX_TYPE(ETHERNET_L2));\ NET_L2_DATA_INIT(dev_name, 0, NET_L2_GET_CTX_TYPE(ETHERNET_L2));\
NET_IF_INIT(dev_name, 0, ETHERNET_L2, mtu, NET_VLAN_MAX_COUNT) NET_IF_INIT(dev_name, 0, ETHERNET_L2, mtu, NET_VLAN_MAX_COUNT)
@ -837,9 +837,9 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
#else /* CONFIG_NET_VLAN */ #else /* CONFIG_NET_VLAN */
#define Z_ETH_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \ #define Z_ETH_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, api, mtu) \ pm_action_cb, data, cfg, prio, api, mtu) \
Z_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \ Z_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, api, \ pm_action_cb, data, cfg, prio, api, \
ETHERNET_L2, NET_L2_GET_CTX_TYPE(ETHERNET_L2),\ ETHERNET_L2, NET_L2_GET_CTX_TYPE(ETHERNET_L2),\
mtu) mtu)
#endif /* CONFIG_NET_VLAN */ #endif /* CONFIG_NET_VLAN */
@ -853,7 +853,7 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
* @param drv_name The name this instance of the driver exposes to * @param drv_name The name this instance of the driver exposes to
* the system. * the system.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -863,10 +863,10 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
* used by the driver. Can be NULL. * used by the driver. Can be NULL.
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define ETH_NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_control_cb, \ #define ETH_NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_action_cb, \
data, cfg, prio, api, mtu) \ data, cfg, prio, api, mtu) \
Z_ETH_NET_DEVICE_INIT(DT_INVALID_NODE, dev_name, drv_name, \ Z_ETH_NET_DEVICE_INIT(DT_INVALID_NODE, dev_name, drv_name, \
init_fn, pm_control_cb, data, cfg, prio, \ init_fn, pm_action_cb, data, cfg, prio, \
api, mtu) api, mtu)
/** /**
@ -877,7 +877,7 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
* *
* @param node_id The devicetree node identifier. * @param node_id The devicetree node identifier.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -887,11 +887,11 @@ static inline bool net_eth_get_vlan_status(struct net_if *iface)
* used by the driver. Can be NULL. * used by the driver. Can be NULL.
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define ETH_NET_DEVICE_DT_DEFINE(node_id, init_fn, pm_control_cb, data, \ #define ETH_NET_DEVICE_DT_DEFINE(node_id, init_fn, pm_action_cb, data, \
cfg, prio, api, mtu) \ cfg, prio, api, mtu) \
Z_ETH_NET_DEVICE_INIT(node_id, Z_DEVICE_DT_DEV_NAME(node_id), \ Z_ETH_NET_DEVICE_INIT(node_id, Z_DEVICE_DT_DEV_NAME(node_id), \
DT_PROP_OR(node_id, label, ""), \ DT_PROP_OR(node_id, label, ""), \
init_fn, pm_control_cb, data, cfg, prio, \ init_fn, pm_action_cb, data, cfg, prio, \
api, mtu) api, mtu)
/** /**

48
include/net/net_if.h
View file

@ -2248,10 +2248,10 @@ struct net_if_api {
/* Network device initialization macros */ /* Network device initialization macros */
#define Z_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \ #define Z_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, api, l2, \ pm_action_cb, data, cfg, prio, api, l2, \
l2_ctx_type, mtu) \ l2_ctx_type, mtu) \
Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \ Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, \ pm_action_cb, data, \
cfg, POST_KERNEL, prio, api); \ cfg, POST_KERNEL, prio, api); \
NET_L2_DATA_INIT(dev_name, 0, l2_ctx_type); \ NET_L2_DATA_INIT(dev_name, 0, l2_ctx_type); \
NET_IF_INIT(dev_name, 0, l2, mtu, NET_IF_MAX_CONFIGS) NET_IF_INIT(dev_name, 0, l2, mtu, NET_IF_MAX_CONFIGS)
@ -2265,7 +2265,7 @@ struct net_if_api {
* @param drv_name The name this instance of the driver exposes to * @param drv_name The name this instance of the driver exposes to
* the system. * the system.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -2277,11 +2277,11 @@ struct net_if_api {
* @param l2_ctx_type Type of L2 context data. * @param l2_ctx_type Type of L2 context data.
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_control_cb, \ #define NET_DEVICE_INIT(dev_name, drv_name, init_fn, pm_action_cb, \
data, cfg, prio, api, l2, \ data, cfg, prio, api, l2, \
l2_ctx_type, mtu) \ l2_ctx_type, mtu) \
Z_NET_DEVICE_INIT(DT_INVALID_NODE, dev_name, drv_name, init_fn, \ Z_NET_DEVICE_INIT(DT_INVALID_NODE, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, api, l2, \ pm_action_cb, data, cfg, prio, api, l2, \
l2_ctx_type, mtu) l2_ctx_type, mtu)
/** /**
@ -2292,7 +2292,7 @@ struct net_if_api {
* *
* @param node_id The devicetree node identifier. * @param node_id The devicetree node identifier.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -2304,11 +2304,11 @@ struct net_if_api {
* @param l2_ctx_type Type of L2 context data. * @param l2_ctx_type Type of L2 context data.
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define NET_DEVICE_DT_DEFINE(node_id, init_fn, pm_control_cb, data, cfg, \ #define NET_DEVICE_DT_DEFINE(node_id, init_fn, pm_action_cb, data, cfg, \
prio, api, l2, l2_ctx_type, mtu) \ prio, api, l2, l2_ctx_type, mtu) \
Z_NET_DEVICE_INIT(node_id, Z_DEVICE_DT_DEV_NAME(node_id), \ Z_NET_DEVICE_INIT(node_id, Z_DEVICE_DT_DEV_NAME(node_id), \
DT_PROP_OR(node_id, label, ""), init_fn, \ DT_PROP_OR(node_id, label, ""), init_fn, \
pm_control_cb, data, cfg, prio, api, l2, \ pm_action_cb, data, cfg, prio, api, l2, \
l2_ctx_type, mtu) l2_ctx_type, mtu)
/** /**
@ -2325,11 +2325,11 @@ struct net_if_api {
NET_DEVICE_DT_DEFINE(DT_DRV_INST(inst), __VA_ARGS__) NET_DEVICE_DT_DEFINE(DT_DRV_INST(inst), __VA_ARGS__)
#define Z_NET_DEVICE_INIT_INSTANCE(node_id, dev_name, drv_name, \ #define Z_NET_DEVICE_INIT_INSTANCE(node_id, dev_name, drv_name, \
instance, init_fn, pm_control_cb, \ instance, init_fn, pm_action_cb, \
data, cfg, prio, api, l2, \ data, cfg, prio, api, l2, \
l2_ctx_type, mtu) \ l2_ctx_type, mtu) \
Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \ Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, POST_KERNEL, \ pm_action_cb, data, cfg, POST_KERNEL, \
prio, api); \ prio, api); \
NET_L2_DATA_INIT(dev_name, instance, l2_ctx_type); \ NET_L2_DATA_INIT(dev_name, instance, l2_ctx_type); \
NET_IF_INIT(dev_name, instance, l2, mtu, NET_IF_MAX_CONFIGS) NET_IF_INIT(dev_name, instance, l2, mtu, NET_IF_MAX_CONFIGS)
@ -2347,7 +2347,7 @@ struct net_if_api {
* the system. * the system.
* @param instance Instance identifier. * @param instance Instance identifier.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -2360,10 +2360,10 @@ struct net_if_api {
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define NET_DEVICE_INIT_INSTANCE(dev_name, drv_name, instance, init_fn, \ #define NET_DEVICE_INIT_INSTANCE(dev_name, drv_name, instance, init_fn, \
pm_control_cb, data, cfg, prio, \ pm_action_cb, data, cfg, prio, \
api, l2, l2_ctx_type, mtu) \ api, l2, l2_ctx_type, mtu) \
Z_NET_DEVICE_INIT_INSTANCE(DT_INVALID_NODE, dev_name, drv_name, \ Z_NET_DEVICE_INIT_INSTANCE(DT_INVALID_NODE, dev_name, drv_name, \
instance, init_fn, pm_control_cb, \ instance, init_fn, pm_action_cb, \
data, cfg, prio, api, l2, \ data, cfg, prio, api, l2, \
l2_ctx_type, mtu) l2_ctx_type, mtu)
@ -2379,7 +2379,7 @@ struct net_if_api {
* @param node_id The devicetree node identifier. * @param node_id The devicetree node identifier.
* @param instance Instance identifier. * @param instance Instance identifier.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -2392,12 +2392,12 @@ struct net_if_api {
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define NET_DEVICE_DT_DEFINE_INSTANCE(node_id, instance, init_fn, \ #define NET_DEVICE_DT_DEFINE_INSTANCE(node_id, instance, init_fn, \
pm_control_cb, data, cfg, prio, \ pm_action_cb, data, cfg, prio, \
api, l2, l2_ctx_type, mtu) \ api, l2, l2_ctx_type, mtu) \
Z_NET_DEVICE_INIT_INSTANCE(node_id, \ Z_NET_DEVICE_INIT_INSTANCE(node_id, \
Z_DEVICE_DT_DEV_NAME(node_id), \ Z_DEVICE_DT_DEV_NAME(node_id), \
DT_LABEL(node_id), instance, \ DT_LABEL(node_id), instance, \
pm_control_cb, data, cfg, prio, api, \ pm_action_cb, data, cfg, prio, api, \
l2, l2_ctx_type, mtu) l2, l2_ctx_type, mtu)
/** /**
@ -2415,10 +2415,10 @@ struct net_if_api {
NET_DEVICE_DT_DEFINE_INSTANCE(DT_DRV_INST(inst), __VA_ARGS__) NET_DEVICE_DT_DEFINE_INSTANCE(DT_DRV_INST(inst), __VA_ARGS__)
#define Z_NET_DEVICE_OFFLOAD_INIT(node_id, dev_name, drv_name, init_fn, \ #define Z_NET_DEVICE_OFFLOAD_INIT(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, \ pm_action_cb, data, cfg, prio, \
api, mtu) \ api, mtu) \
Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \ Z_DEVICE_DEFINE(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, POST_KERNEL, prio, api);\ pm_action_cb, data, cfg, POST_KERNEL, prio, api);\
NET_IF_OFFLOAD_INIT(dev_name, 0, mtu) NET_IF_OFFLOAD_INIT(dev_name, 0, mtu)
/** /**
@ -2432,7 +2432,7 @@ struct net_if_api {
* @param drv_name The name this instance of the driver exposes to * @param drv_name The name this instance of the driver exposes to
* the system. * the system.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -2443,9 +2443,9 @@ struct net_if_api {
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define NET_DEVICE_OFFLOAD_INIT(dev_name, drv_name, init_fn, \ #define NET_DEVICE_OFFLOAD_INIT(dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, api, mtu)\ pm_action_cb, data, cfg, prio, api, mtu)\
Z_NET_DEVICE_OFFLOAD_INIT(DT_INVALID_NODE, dev_name, drv_name, \ Z_NET_DEVICE_OFFLOAD_INIT(DT_INVALID_NODE, dev_name, drv_name, \
init_fn, pm_control_cb, data, cfg, prio,\ init_fn, pm_action_cb, data, cfg, prio,\
api, mtu) api, mtu)
/** /**
@ -2458,7 +2458,7 @@ struct net_if_api {
* *
* @param node_id The devicetree node identifier. * @param node_id The devicetree node identifier.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -2468,11 +2468,11 @@ struct net_if_api {
* used by the driver. Can be NULL. * used by the driver. Can be NULL.
* @param mtu Maximum transfer unit in bytes for this network interface. * @param mtu Maximum transfer unit in bytes for this network interface.
*/ */
#define NET_DEVICE_DT_OFFLOAD_DEFINE(node_id, init_fn, pm_control_cb, \ #define NET_DEVICE_DT_OFFLOAD_DEFINE(node_id, init_fn, pm_action_cb, \
data, cfg, prio, api, mtu) \ data, cfg, prio, api, mtu) \
Z_NET_DEVICE_OFFLOAD_INIT(node_id, Z_DEVICE_DT_DEV_NAME(node_id), \ Z_NET_DEVICE_OFFLOAD_INIT(node_id, Z_DEVICE_DT_DEV_NAME(node_id), \
DT_PROP_OR(node_id, label, NULL), \ DT_PROP_OR(node_id, label, NULL), \
init_fn, pm_control_cb, data, cfg, \ init_fn, pm_action_cb, data, cfg, \
prio, api, mtu) prio, api, mtu)
/** /**

10
include/net/virtual.h
View file

@ -274,10 +274,10 @@ net_virtual_get_iface_capabilities(struct net_if *iface)
} }
#define Z_NET_VIRTUAL_INTERFACE_INIT(node_id, dev_name, drv_name, \ #define Z_NET_VIRTUAL_INTERFACE_INIT(node_id, dev_name, drv_name, \
init_fn, pm_control_cb, data, cfg, \ init_fn, pm_action_cb, data, cfg, \
prio, api, mtu) \ prio, api, mtu) \
Z_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \ Z_NET_DEVICE_INIT(node_id, dev_name, drv_name, init_fn, \
pm_control_cb, data, cfg, prio, api, \ pm_action_cb, data, cfg, prio, api, \
VIRTUAL_L2, NET_L2_GET_CTX_TYPE(VIRTUAL_L2), \ VIRTUAL_L2, NET_L2_GET_CTX_TYPE(VIRTUAL_L2), \
mtu) mtu)
/** @endcond */ /** @endcond */
@ -294,7 +294,7 @@ net_virtual_get_iface_capabilities(struct net_if *iface)
* @param drv_name The name this instance of the driver exposes to * @param drv_name The name this instance of the driver exposes to
* the system. * the system.
* @param init_fn Address to the init function of the driver. * @param init_fn Address to the init function of the driver.
* @param pm_control_cb Pointer to pm_control function. * @param pm_action_cb Pointer to PM action callback.
* Can be NULL if not implemented. * Can be NULL if not implemented.
* @param data Pointer to the device's private data. * @param data Pointer to the device's private data.
* @param cfg The address to the structure containing the * @param cfg The address to the structure containing the
@ -306,10 +306,10 @@ net_virtual_get_iface_capabilities(struct net_if *iface)
* This is the default value and its value can be tweaked at runtime. * This is the default value and its value can be tweaked at runtime.
*/ */
#define NET_VIRTUAL_INTERFACE_INIT(dev_name, drv_name, init_fn, \ #define NET_VIRTUAL_INTERFACE_INIT(dev_name, drv_name, init_fn, \
pm_control_cb, \ pm_action_cb, \
data, cfg, prio, api, mtu) \ data, cfg, prio, api, mtu) \
Z_NET_VIRTUAL_INTERFACE_INIT(DT_INVALID_NODE, dev_name, \ Z_NET_VIRTUAL_INTERFACE_INIT(DT_INVALID_NODE, dev_name, \
drv_name, init_fn, pm_control_cb, \ drv_name, init_fn, pm_action_cb, \
data, cfg, prio, api, mtu) data, cfg, prio, api, mtu)
/** /**