Skip to content

Commit b06146b

Browse files
Gavin Shanwilldeacon
authored andcommitted
firmware: arm_sdei: Remove while loop in sdei_event_unregister()
This removes the unnecessary while loop in sdei_event_unregister() because of the following two reasons. This shouldn't cause any functional changes. * The while loop is executed for once, meaning it's not needed in theory. * With the while loop removed, the nested statements can be avoid to make the code a bit cleaner. Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/r/20200922130423.10173-10-gshan@redhat.com Signed-off-by: Will Deacon <will@kernel.org>
1 parent 1bbc755 commit b06146b

1 file changed

Lines changed: 14 additions & 15 deletions

File tree

drivers/firmware/arm_sdei.c

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -491,24 +491,23 @@ int sdei_event_unregister(u32 event_num)
491491

492492
mutex_lock(&sdei_events_lock);
493493
event = sdei_event_find(event_num);
494-
do {
495-
if (!event) {
496-
pr_warn("Event %u not registered\n", event_num);
497-
err = -ENOENT;
498-
break;
499-
}
494+
if (!event) {
495+
pr_warn("Event %u not registered\n", event_num);
496+
err = -ENOENT;
497+
goto unlock;
498+
}
500499

501-
spin_lock(&sdei_list_lock);
502-
event->reregister = false;
503-
event->reenable = false;
504-
spin_unlock(&sdei_list_lock);
500+
spin_lock(&sdei_list_lock);
501+
event->reregister = false;
502+
event->reenable = false;
503+
spin_unlock(&sdei_list_lock);
505504

506-
err = _sdei_event_unregister(event);
507-
if (err)
508-
break;
505+
err = _sdei_event_unregister(event);
506+
if (err)
507+
goto unlock;
509508

510-
sdei_event_destroy(event);
511-
} while (0);
509+
sdei_event_destroy(event);
510+
unlock:
512511
mutex_unlock(&sdei_events_lock);
513512

514513
return err;

0 commit comments

Comments
 (0)