Skip to content

Commit 957ece8

Browse files
bjarki-andreasenfabiobaltieri
authored andcommitted
drivers: comparator: update API to use DEIVCE_API macros
Update comparator API and device drivers to use DEVICE_API macros. Signed-off-by: Bjarki Arge Andreasen <[email protected]>
1 parent 3e87587 commit 957ece8

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

drivers/comparator/comparator_fake_comp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ DEFINE_FAKE_VALUE_FUNC(int,
3131
comp_fake_comp_trigger_is_pending,
3232
const struct device *);
3333

34-
static const struct comparator_driver_api fake_comp_api = {
34+
static DEVICE_API(comparator, fake_comp_api) = {
3535
.get_output = comp_fake_comp_get_output,
3636
.set_trigger = comp_fake_comp_set_trigger,
3737
.set_trigger_callback = comp_fake_comp_set_trigger_callback,

drivers/comparator/comparator_mcux_acmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ static int mcux_acmp_trigger_is_pending(const struct device *dev)
375375
return 0;
376376
}
377377

378-
static const struct comparator_driver_api mcux_acmp_comp_api = {
378+
static DEVICE_API(comparator, mcux_acmp_comp_api) = {
379379
.get_output = mcux_acmp_get_output,
380380
.set_trigger = mcux_acmp_set_trigger,
381381
.set_trigger_callback = mcux_acmp_set_trigger_callback,

drivers/comparator/comparator_nrf_comp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ static int shim_nrf_comp_trigger_is_pending(const struct device *dev)
666666
return atomic_test_and_clear_bit(&shim_nrf_comp_data0.triggered, 0);
667667
}
668668

669-
static const struct comparator_driver_api shim_nrf_comp_api = {
669+
static DEVICE_API(comparator, shim_nrf_comp_api) = {
670670
.get_output = shim_nrf_comp_get_output,
671671
.set_trigger = shim_nrf_comp_set_trigger,
672672
.set_trigger_callback = shim_nrf_comp_set_trigger_callback,

drivers/comparator/comparator_nrf_lpcomp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ static int shim_nrf_lpcomp_trigger_is_pending(const struct device *dev)
418418
return atomic_test_and_clear_bit(&shim_nrf_lpcomp_data0.triggered, 0);
419419
}
420420

421-
static const struct comparator_driver_api shim_nrf_lpcomp_api = {
421+
static DEVICE_API(comparator, shim_nrf_lpcomp_api) = {
422422
.get_output = shim_nrf_lpcomp_get_output,
423423
.set_trigger = shim_nrf_lpcomp_set_trigger,
424424
.set_trigger_callback = shim_nrf_lpcomp_set_trigger_callback,

include/zephyr/drivers/comparator.h

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,7 @@ __syscall int comparator_get_output(const struct device *dev);
7070

7171
static inline int z_impl_comparator_get_output(const struct device *dev)
7272
{
73-
const struct comparator_driver_api *api =
74-
(const struct comparator_driver_api *)dev->api;
75-
76-
return api->get_output(dev);
73+
return DEVICE_API_GET(comparator, dev)->get_output(dev);
7774
}
7875

7976
/**
@@ -91,10 +88,7 @@ __syscall int comparator_set_trigger(const struct device *dev,
9188
static inline int z_impl_comparator_set_trigger(const struct device *dev,
9289
enum comparator_trigger trigger)
9390
{
94-
const struct comparator_driver_api *api =
95-
(const struct comparator_driver_api *)dev->api;
96-
97-
return api->set_trigger(dev, trigger);
91+
return DEVICE_API_GET(comparator, dev)->set_trigger(dev, trigger);
9892
}
9993

10094
/**
@@ -114,10 +108,7 @@ static inline int comparator_set_trigger_callback(const struct device *dev,
114108
comparator_callback_t callback,
115109
void *user_data)
116110
{
117-
const struct comparator_driver_api *api =
118-
(const struct comparator_driver_api *)dev->api;
119-
120-
return api->set_trigger_callback(dev, callback, user_data);
111+
return DEVICE_API_GET(comparator, dev)->set_trigger_callback(dev, callback, user_data);
121112
}
122113

123114
/**
@@ -133,10 +124,7 @@ __syscall int comparator_trigger_is_pending(const struct device *dev);
133124

134125
static inline int z_impl_comparator_trigger_is_pending(const struct device *dev)
135126
{
136-
const struct comparator_driver_api *api =
137-
(const struct comparator_driver_api *)dev->api;
138-
139-
return api->trigger_is_pending(dev);
127+
return DEVICE_API_GET(comparator, dev)->trigger_is_pending(dev);
140128
}
141129

142130
#ifdef __cplusplus

0 commit comments

Comments
 (0)