Commit 4b2b76cb authored by Gavin Shan's avatar Gavin Shan Committed by Will Deacon

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: default avatarGavin Shan <gshan@redhat.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: default avatarJames Morse <james.morse@arm.com>
Link: https://lore.kernel.org/r/20200922130423.10173-14-gshan@redhat.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent d2fc580d
...@@ -487,16 +487,6 @@ static void _local_event_unregister(void *data) ...@@ -487,16 +487,6 @@ static void _local_event_unregister(void *data)
sdei_cross_call_return(arg, err); sdei_cross_call_return(arg, err);
} }
static int _sdei_event_unregister(struct sdei_event *event)
{
lockdep_assert_held(&sdei_events_lock);
if (event->type == SDEI_EVENT_TYPE_SHARED)
return sdei_api_event_unregister(event->event_num);
return sdei_do_cross_call(_local_event_unregister, event);
}
int sdei_event_unregister(u32 event_num) int sdei_event_unregister(u32 event_num)
{ {
int err; int err;
...@@ -517,7 +507,11 @@ int sdei_event_unregister(u32 event_num) ...@@ -517,7 +507,11 @@ int sdei_event_unregister(u32 event_num)
event->reenable = false; event->reenable = false;
spin_unlock(&sdei_list_lock); spin_unlock(&sdei_list_lock);
err = _sdei_event_unregister(event); if (event->type == SDEI_EVENT_TYPE_SHARED)
err = sdei_api_event_unregister(event->event_num);
else
err = sdei_do_cross_call(_local_event_unregister, event);
if (err) if (err)
goto unlock; goto unlock;
...@@ -543,7 +537,7 @@ static int sdei_unregister_shared(void) ...@@ -543,7 +537,7 @@ static int sdei_unregister_shared(void)
if (event->type != SDEI_EVENT_TYPE_SHARED) if (event->type != SDEI_EVENT_TYPE_SHARED)
continue; continue;
err = _sdei_event_unregister(event); err = sdei_api_event_unregister(event->event_num);
if (err) if (err)
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment