From patchwork Wed Dec 2 07:44:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 57534 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2702514lbb; Tue, 1 Dec 2015 23:45:08 -0800 (PST) X-Received: by 10.66.162.38 with SMTP id xx6mr2576383pab.57.1449042308520; Tue, 01 Dec 2015 23:45:08 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rp16si2987759pab.8.2015.12.01.23.45.08; Tue, 01 Dec 2015 23:45:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756720AbbLBHpG (ORCPT + 6 others); Wed, 2 Dec 2015 02:45:06 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:57400 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756717AbbLBHpF (ORCPT ); Wed, 2 Dec 2015 02:45:05 -0500 Received: from 172.24.1.49 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.49]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DAB56099; Wed, 02 Dec 2015 15:44:53 +0800 (CST) Received: from localhost (10.177.17.188) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Wed, 2 Dec 2015 15:44:44 +0800 From: Hanjun Guo To: "Rafael J. Wysocki" CC: , Kejian Yan , "Hanjun Guo" Subject: [PATCH] ACPI / property: fix compile error for acpi_node_get_property_reference() when CONFIG_ACPI=n Date: Wed, 2 Dec 2015 15:44:22 +0800 Message-ID: <1449042262-11052-1-git-send-email-guohanjun@huawei.com> X-Mailer: git-send-email 1.7.10.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.177.17.188] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020201.565EA178.0054, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 9b69cd5c9876f61369f6871dc4be3dfc Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Hanjun Guo 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. Reported-by: Kejian Yan Signed-off-by: Hanjun Guo --- include/linux/acpi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.7.12.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 93811dc..7c603e4 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -872,8 +872,8 @@ static inline int acpi_dev_get_property(struct acpi_device *adev, } static inline int acpi_node_get_property_reference(struct fwnode_handle *fwnode, - 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; }