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

Commit 3bd81a87 authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2 



V2: Fix typo: pr->handle -> pr, here: acpi_processor_hotadd_init(pr)

This is a very small part taken from patches which afaik
are coming from Yunhong Jiang (for a Xen not a Linus repo?).

Cleanup only: no functional change.

Advantage (beside cleanup) is that other data of the pr (acpi_processor) struct
in the acpi_processor_hotadd_init() is needed later, for example a newly
introduced flag:
pr->flags.need_hotplug_init

Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Jiang, Yunhong <yunhong.jiang@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 5e7590d4

drivers/acpi/processor_driver.c

+8 −9
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ MODULE_LICENSE("GPL"); 
static int acpi_processor_add(struct acpi_device *device);

static int acpi_processor_remove(struct acpi_device *device, int type);

static void acpi_processor_notify(struct acpi_device *device, u32 event);

static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);

static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr);

static int acpi_processor_handle_eject(struct acpi_processor *pr);
@@ -324,11 +324,9 @@ static int acpi_processor_get_info(struct acpi_device *device) 
	 *  they are physically not present.

	 */

	if (pr->id == -1) {

		if (ACPI_FAILURE

		    (acpi_processor_hotadd_init(pr->handle, &pr->id))) {

		if (ACPI_FAILURE(acpi_processor_hotadd_init(pr)))

			return -ENODEV;

	}

	}

	/*

	 * On some boxes several processors use the same processor bus id.

	 * But they are located in different scope. For example:
@@ -721,18 +719,19 @@ processor_walk_namespace_cb(acpi_handle handle, 
	return (AE_OK);

}



static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)

static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)

{

	acpi_handle handle = pr->handle;



	if (!is_processor_present(handle)) {

		return AE_ERROR;

	}



	if (acpi_map_lsapic(handle, p_cpu))

	if (acpi_map_lsapic(handle, &pr->id))

		return AE_ERROR;



	if (arch_register_cpu(*p_cpu)) {

		acpi_unmap_lsapic(*p_cpu);

	if (arch_register_cpu(pr->id)) {

		acpi_unmap_lsapic(pr->id);

		return AE_ERROR;

	}
@@ -749,7 +748,7 @@ static int acpi_processor_handle_eject(struct acpi_processor *pr) 
	return (0);

}

#else

static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)

static acpi_status acpi_processor_hotadd_init(struct acpi_processor *pr)

{

	return AE_ERROR;

}