]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ACPI / numa: Simplify acpi_get_node() style
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 24 Jan 2014 22:42:17 +0000 (15:42 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Feb 2014 17:39:32 +0000 (10:39 -0700)
Simplify control flow by removing local variable initialization and
returning a constant as soon as possible.  No functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/numa.c

index dab7dac6b1a8fa1d9689b5e70f18202a109031de..a7e779bfa2f6ea91aa22df52de6bf28cdeccd86c 100644 (file)
@@ -333,12 +333,12 @@ int acpi_get_pxm(acpi_handle h)
 
 int acpi_get_node(acpi_handle handle)
 {
-       int pxm, node = NUMA_NO_NODE;
+       int pxm;
 
        pxm = acpi_get_pxm(handle);
-       if (pxm >= 0 && pxm < MAX_PXM_DOMAINS)
-               node = acpi_map_pxm_to_node(pxm);
+       if (pxm < 0 || pxm >= MAX_PXM_DOMAINS)
+               return NUMA_NO_NODE;
 
-       return node;
+       return acpi_map_pxm_to_node(pxm);
 }
 EXPORT_SYMBOL(acpi_get_node);