michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: poll: remove unreachable code

Browse source 
register_event always returns 0, so the conditional will
always take the first branch and code in the else part
is never reached.

Fixes #31282

Signed-off-by: Ningx Zhao <ningx.zhao@intel.com>
This commit is contained in:
Ningx Zhao 2021-01-13 16:46:03 +08:00 • committed by Anas Nashif
commit ff7ec0ce40
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kernel/poll.c
View file

@ -118,7 +118,7 @@ static inline void add_event(sys_dlist_t *events, struct k_poll_event *event,
} }
/* must be called with interrupts locked */ /* must be called with interrupts locked */
static inline int register_event(struct k_poll_event *event, static inline void register_event(struct k_poll_event *event,
struct z_poller *poller) struct z_poller *poller)
{ {
switch (event->type) { switch (event->type) {
@ -143,8 +143,6 @@ static inline int register_event(struct k_poll_event *event,
} }
event->poller = poller; event->poller = poller;
return 0;
} }
/* must be called with interrupts locked */ /* must be called with interrupts locked */
@ -213,12 +211,8 @@ static inline int register_events(struct k_poll_event *events,
set_event_ready(&events[ii], state); set_event_ready(&events[ii], state);
poller->is_polling = false; poller->is_polling = false;
} else if (!just_check && poller->is_polling) { } else if (!just_check && poller->is_polling) {
int rc = register_event(&events[ii], poller); register_event(&events[ii], poller);
if (rc == 0) { events_registered += 1;
events_registered += 1;
} else {
__ASSERT(false, "unexpected return code\n");
}
} }
k_spin_unlock(&lock, key); k_spin_unlock(&lock, key);
} }