Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba574dc8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / hotplug: Simplify acpi_set_hp_context() 



Since all of the acpi_set_hp_context() callers pass at least one NULL
function pointer and one caller passes NULL function pointers only
to it, drop function pointer arguments from acpi_set_hp_context()
and make the callers initialize the function pointers in struct
acpi_hotplug_context by themselves before passing it to
acpi_set_hp_context().

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 86f5f3ca

drivers/acpi/scan.c

+3 −1
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ void acpi_initialize_hp_context(struct acpi_device *adev, 
				void (*uevent)(struct acpi_device *, u32))

{

	acpi_lock_hp_context();

	acpi_set_hp_context(adev, hp, notify, uevent, NULL);

	hp->notify = notify;

	hp->uevent = uevent;

	acpi_set_hp_context(adev, hp);

	acpi_unlock_hp_context();

}

EXPORT_SYMBOL_GPL(acpi_initialize_hp_context);

drivers/pci/hotplug/acpiphp_glue.c

+4 −3
Original line number Diff line number Diff line
@@ -80,8 +80,9 @@ static struct acpiphp_context *acpiphp_init_context(struct acpi_device *adev) 
		return NULL;



	context->refcount = 1;

	acpi_set_hp_context(adev, &context->hp, acpiphp_hotplug_notify, NULL,

			    acpiphp_post_dock_fixup);

	context->hp.notify = acpiphp_hotplug_notify;

	context->hp.fixup = acpiphp_post_dock_fixup;

	acpi_set_hp_context(adev, &context->hp);

	return context;

}
@@ -876,7 +877,7 @@ void acpiphp_enumerate_slots(struct pci_bus *bus) 
			goto err;



		root_context->root_bridge = bridge;

		acpi_set_hp_context(adev, &root_context->hp, NULL, NULL, NULL);

		acpi_set_hp_context(adev, &root_context->hp);

	} else {

		struct acpiphp_context *context;

include/acpi/acpi_bus.h

+1 −7
Original line number Diff line number Diff line
@@ -372,15 +372,9 @@ static inline void acpi_set_device_status(struct acpi_device *adev, u32 sta) 
}



static inline void acpi_set_hp_context(struct acpi_device *adev,

				       struct acpi_hotplug_context *hp,

				       int (*notify)(struct acpi_device *, u32),

				       void (*uevent)(struct acpi_device *, u32),

				       void (*fixup)(struct acpi_device *))

				       struct acpi_hotplug_context *hp)

{

	hp->self = adev;

	hp->notify = notify;

	hp->uevent = uevent;

	hp->fixup = fixup;

	adev->hp = hp;

}