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

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

Merge branch 'acpi-assorted-cleanup' into acpi-cleanup 

* acpi-assorted-cleanup:
  ACP / fan: trivial style cleanup
  ACPI / processor: remove superfluous pr == NULL checks
  ACPI / mm: use NUMA_NO_NODE
parents 74facaf7 568b6ad8

drivers/acpi/acpi_memhotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static void acpi_memory_remove_memory(struct acpi_memory_device *mem_device) 
		if (!info->enabled)

			continue;



		if (nid < 0)

		if (nid == NUMA_NO_NODE)

			nid = memory_add_physaddr_to_nid(info->start_addr);



		acpi_unbind_memory_blocks(info, handle);

drivers/acpi/numa.c

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int acpi_map_pxm_to_node(int pxm) 
{

	int node = pxm_to_node_map[pxm];



	if (node < 0) {

	if (node == NUMA_NO_NODE) {

		if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)

			return NUMA_NO_NODE;

		node = first_unset_node(nodes_found_map);
@@ -334,7 +334,7 @@ int acpi_get_pxm(acpi_handle h) 


int acpi_get_node(acpi_handle *handle)

{

	int pxm, node = -1;

	int pxm, node = NUMA_NO_NODE;



	pxm = acpi_get_pxm(handle);

	if (pxm >= 0 && pxm < MAX_PXM_DOMAINS)

drivers/acpi/processor_idle.c

+1 −14
Original line number Diff line number Diff line
@@ -272,9 +272,6 @@ static void tsc_check_state(int state) { return; } 
static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)

{



	if (!pr)

		return -EINVAL;



	if (!pr->pblk)

		return -ENODEV;
@@ -1076,12 +1073,8 @@ int acpi_processor_hotplug(struct acpi_processor *pr) 
	if (disabled_by_idle_boot_param())

		return 0;



	if (!pr)

		return -EINVAL;



	if (nocst) {

	if (nocst)

		return -ENODEV;

	}



	if (!pr->flags.power_setup_done)

		return -ENODEV;
@@ -1108,9 +1101,6 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) 
	if (disabled_by_idle_boot_param())

		return 0;



	if (!pr)

		return -EINVAL;



	if (nocst)

		return -ENODEV;
@@ -1183,9 +1173,6 @@ int acpi_processor_power_init(struct acpi_processor *pr) 
		first_run++;

	}



	if (!pr)

		return -EINVAL;



	if (acpi_gbl_FADT.cst_control && !nocst) {

		status =

		    acpi_os_write_port(acpi_gbl_FADT.smi_command, acpi_gbl_FADT.cst_control, 8);

drivers/acpi/fan.c

+1 −1

File changed.

Contains only whitespace changes.