Skip to content

Commit 4b2b76c

Browse files
Gavin Shanwilldeacon
authored andcommitted
firmware: arm_sdei: Remove _sdei_event_unregister()
_sdei_event_unregister() is called by sdei_event_unregister() and sdei_device_freeze(). _sdei_event_unregister() covers the shared and private events, but sdei_device_freeze() only covers the shared events. So the logic to cover the private events isn't needed by sdei_device_freeze(). sdei_event_unregister sdei_device_freeze _sdei_event_unregister sdei_unregister_shared _sdei_event_unregister This removes _sdei_event_unregister(). Its logic is moved to its callers accordingly. This shouldn't cause any logical changes. Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: James Morse <james.morse@arm.com> Link: https://lore.kernel.org/r/20200922130423.10173-14-gshan@redhat.com Signed-off-by: Will Deacon <will@kernel.org>
1 parent d2fc580 commit 4b2b76c

1 file changed

Lines changed: 6 additions & 12 deletions

File tree

drivers/firmware/arm_sdei.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -487,16 +487,6 @@ static void _local_event_unregister(void *data)
487487
sdei_cross_call_return(arg, err);
488488
}
489489

490-
static int _sdei_event_unregister(struct sdei_event *event)
491-
{
492-
lockdep_assert_held(&sdei_events_lock);
493-
494-
if (event->type == SDEI_EVENT_TYPE_SHARED)
495-
return sdei_api_event_unregister(event->event_num);
496-
497-
return sdei_do_cross_call(_local_event_unregister, event);
498-
}
499-
500490
int sdei_event_unregister(u32 event_num)
501491
{
502492
int err;
@@ -517,7 +507,11 @@ int sdei_event_unregister(u32 event_num)
517507
event->reenable = false;
518508
spin_unlock(&sdei_list_lock);
519509

520-
err = _sdei_event_unregister(event);
510+
if (event->type == SDEI_EVENT_TYPE_SHARED)
511+
err = sdei_api_event_unregister(event->event_num);
512+
else
513+
err = sdei_do_cross_call(_local_event_unregister, event);
514+
521515
if (err)
522516
goto unlock;
523517

@@ -543,7 +537,7 @@ static int sdei_unregister_shared(void)
543537
if (event->type != SDEI_EVENT_TYPE_SHARED)
544538
continue;
545539

546-
err = _sdei_event_unregister(event);
540+
err = sdei_api_event_unregister(event->event_num);
547541
if (err)
548542
break;
549543
}

0 commit comments

Comments
 (0)