Skip to content

Commit cc698fb

Browse files
committed
modules: Switching DEVICE_<DT/DT_INST>_DEFINE macros to new ones
Switching to DEVICE_INSTANCE and DEVICE_INSTANCE_FROM_DT_INST, thus merging former DEVICE_DEFINE and DEVICE_DT_DEFINE into one, so removing the name parameter from the earier and finally removing the prio parameter on all. Signed-off-by: Tomasz Bursztyka <[email protected]>
1 parent e4b5930 commit cc698fb

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

modules/lvgl/input/lvgl_button_input.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ int lvgl_button_input_init(const struct device *dev)
8181
.coordinates = lvgl_button_coordinates_##inst, \
8282
}; \
8383
static struct lvgl_common_input_data lvgl_common_input_data_##inst; \
84-
DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &lvgl_common_input_data_##inst, \
84+
DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &lvgl_common_input_data_##inst, \
8585
&lvgl_button_input_config_##inst, POST_KERNEL, \
86-
CONFIG_INPUT_INIT_PRIORITY, NULL);
86+
NULL);
8787

8888
DT_INST_FOREACH_STATUS_OKAY(LVGL_BUTTON_INPUT_DEFINE)

modules/lvgl/input/lvgl_encoder_input.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ int lvgl_encoder_input_init(const struct device *dev)
6868
.button_input_code = BUTTON_CODE(inst), \
6969
}; \
7070
static struct lvgl_common_input_data lvgl_common_input_data_##inst; \
71-
DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &lvgl_common_input_data_##inst, \
71+
DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &lvgl_common_input_data_##inst, \
7272
&lvgl_encoder_input_config_##inst, POST_KERNEL, \
73-
CONFIG_INPUT_INIT_PRIORITY, NULL);
73+
NULL);
7474

7575
DT_INST_FOREACH_STATUS_OKAY(LVGL_ENCODER_INPUT_DEFINE)

modules/lvgl/input/lvgl_keypad_input.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ int lvgl_keypad_input_init(const struct device *dev)
6868
.num_codes = DT_INST_PROP_LEN(inst, input_codes), \
6969
}; \
7070
static struct lvgl_common_input_data lvgl_common_input_data_##inst; \
71-
DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &lvgl_common_input_data_##inst, \
71+
DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &lvgl_common_input_data_##inst, \
7272
&lvgl_keypad_input_config_##inst, POST_KERNEL, \
73-
CONFIG_INPUT_INIT_PRIORITY, NULL);
73+
NULL);
7474

7575
DT_INST_FOREACH_STATUS_OKAY(LVGL_KEYPAD_INPUT_DEFINE)

modules/lvgl/input/lvgl_pointer_input.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ int lvgl_pointer_input_init(const struct device *dev)
142142
.invert_y = DT_INST_PROP(inst, invert_y), \
143143
}; \
144144
static struct lvgl_pointer_input_data lvgl_pointer_input_data_##inst; \
145-
DEVICE_DT_INST_DEFINE(inst, NULL, NULL, &lvgl_pointer_input_data_##inst, \
145+
DEVICE_INSTANCE_FROM_DT_INST(inst, NULL, NULL, &lvgl_pointer_input_data_##inst, \
146146
&lvgl_pointer_input_config_##inst, POST_KERNEL, \
147-
CONFIG_INPUT_INIT_PRIORITY, NULL);
147+
NULL);
148148

149149
DT_INST_FOREACH_STATUS_OKAY(LVGL_POINTER_INPUT_DEFINE)

0 commit comments

Comments
 (0)