From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Hanjun Guo , "Rafael J. Wysocki" , Kamal Mostafa Subject: [PATCH 4.2.y-ckt 114/305] ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n Date: Fri, 15 Jan 2016 15:58:48 -0800 Message-Id: <1452902519-2754-115-git-send-email-kamal@canonical.com> In-Reply-To: <1452902519-2754-1-git-send-email-kamal@canonical.com> References: <1452902519-2754-1-git-send-email-kamal@canonical.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: 4.2.8-ckt2 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: Hanjun Guo 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 Signed-off-by: Hanjun Guo Acked-by: Mika Westerberg Signed-off-by: Rafael J. Wysocki Signed-off-by: Kamal Mostafa --- 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