firmware: arm_sdei: Remove _sdei_event_unregister() (4b2b76cb) · Commits · 戴 / test

_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>

drivers/firmware/arm_sdei.c

+6 −12

Original line number	Diff line number	Diff line
		@@ -487,16 +487,6 @@ static void _local_event_unregister(void *data)
		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 err;
		@@ -517,7 +507,11 @@ int sdei_event_unregister(u32 event_num)
		event->reenable = false;
		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)
		goto unlock;

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

		err = _sdei_event_unregister(event);
		err = sdei_api_event_unregister(event->event_num);
		if (err)
		break;
		}

Admin message