[4.2.y-ckt stable] Patch "ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n

to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue

This patch is scheduled to be released in version 4.2.8-ckt2.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 4.2.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

---8<------------------------------------------------------------

>From 6f7136973e5649d48ac1b3c025b0b5550e6810a5 Mon Sep 17 00:00:00 2001
From: Hanjun Guo <hanjun.guo at linaro.org>
Date: Wed, 2 Dec 2015 15:44:22 +0800
Subject: ACPI / property: fix compile error for
 acpi_node_get_property_reference() when CONFIG_ACPI=n

commit 64031e3e8a5c042840c5123af695eec89f9e6a24 upstream.

In commit 60ba032ed76e ("ACPI / property: Drop size_prop from
acpi_dev_get_property_reference()"), the argument "const char *cells_name"
was dropped, but forgot to update the stub function in no-ACPI case,
it will lead to compile error when CONFIG_ACPI=n, easliy remove
"const char *cells_name" to fix it.

Fixes: 60ba032ed76e "ACPI / property: Drop size_prop from acpi_dev_get_property_reference()"
Reported-by: Kejian Yan <yankejian at huawei.com>
Signed-off-by: Hanjun Guo <hanjun.guo at linaro.org>
Acked-by: Mika Westerberg <mika.westerberg at linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 include/linux/acpi.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index b92ec06..242c84d 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -784,8 +784,8 @@ static inline int acpi_dev_get_property_array(struct acpi_device *adev,
 	return -ENXIO;
 }
 static inline int acpi_dev_get_property_reference(struct acpi_device *adev,
-				const char *name, const char *cells_name,
-				size_t index, struct acpi_reference_args *args)
+				const char *name, size_t index,
+				struct acpi_reference_args *args)
 {
 	return -ENXIO;
 }
--
1.9.1