Skip to content

Commit 6fc42a0

Browse files
gmarullcarlescufi
authored andcommitted
device: s/Z_DEVICE_HANDLE_NAME/Z_DEVICE_HANDLES_NAME
Use Z_DEVICE_HANDLES_NAME to be consistent with the definition macro. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent 84d1982 commit 6fc42a0

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/zephyr/device.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ static inline bool z_impl_device_is_ready(const struct device *dev)
827827
* @param node_id Devicetree node id of the device.
828828
* @param dev_id Device identifier.
829829
*/
830-
#define Z_DEVICE_HANDLE_NAME(node_id, dev_id) \
830+
#define Z_DEVICE_HANDLES_NAME(node_id, dev_id) \
831831
_CONCAT(__devicehdl_, \
832832
COND_CODE_1(DT_NODE_EXISTS(node_id), \
833833
(node_id), \
@@ -884,10 +884,10 @@ static inline bool z_impl_device_is_ready(const struct device *dev)
884884
*/
885885
#define Z_DEVICE_HANDLES_DEFINE(node_id, dev_id, ...) \
886886
extern Z_DEVICE_HANDLES_CONST device_handle_t \
887-
Z_DEVICE_HANDLE_NAME(node_id, dev_id)[]; \
887+
Z_DEVICE_HANDLES_NAME(node_id, dev_id)[]; \
888888
Z_DEVICE_HANDLES_CONST Z_DECL_ALIGN(device_handle_t) \
889889
Z_DEVICE_HANDLES_SECTION __weak \
890-
Z_DEVICE_HANDLE_NAME(node_id, dev_id)[] = { \
890+
Z_DEVICE_HANDLES_NAME(node_id, dev_id)[] = { \
891891
COND_CODE_1(DT_NODE_EXISTS(node_id), ( \
892892
DT_DEP_ORD(node_id), \
893893
DT_REQUIRES_DEP_ORDS(node_id) \
@@ -1017,7 +1017,7 @@ static inline bool z_impl_device_is_ready(const struct device *dev)
10171017
\
10181018
Z_DEVICE_BASE_DEFINE(node_id, dev_id, name, pm, data, config, level, \
10191019
prio, api, state, \
1020-
Z_DEVICE_HANDLE_NAME(node_id, dev_id)); \
1020+
Z_DEVICE_HANDLES_NAME(node_id, dev_id)); \
10211021
\
10221022
Z_DEVICE_INIT_ENTRY_DEFINE(dev_id, init_fn, level, prio)
10231023

0 commit comments

Comments
 (0)