From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754039AbaAFIrk (ORCPT ); Mon, 6 Jan 2014 03:47:40 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:62003 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751864AbaAFIpc (ORCPT ); Mon, 6 Jan 2014 03:45:32 -0500 X-IronPort-AV: E=Sophos;i="4.95,611,1384272000"; d="scan'208";a="9378089" From: Tang Chen To: rjw@sisk.pl, lenb@kernel.org, toshi.kani@hp.com Cc: tangchen@cn.fujitsu.com, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] acpi: Return -ENOENT in acpi_table_parse() and fix wrong comment. Date: Mon, 6 Jan 2014 16:47:59 +0800 Message-Id: <1388998079-28160-1-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/01/06 16:44:30, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/01/06 16:44:31, Serialize complete at 2014/01/06 16:44:31 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The comment about return value of acpi_table_parse() is incorrect. This patch fix it. Since all callers only check if the function succeeded or not, this patch simplifies the semantics by returning -errno for all failure cases. This will also simply the comment. As suggested by Toshi Kani , also change the stub in linux/acpi.h to return -ENODEV. Signed-off-by: Tang Chen --- drivers/acpi/tables.c | 7 ++++--- include/linux/acpi.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 5a5263b..10022ae 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -278,12 +278,13 @@ acpi_table_parse_madt(enum acpi_madt_type id, /** * acpi_table_parse - find table with @id, run @handler on it - * * @id: table id to find * @handler: handler to run * * Scan the ACPI System Descriptor Table (STD) for a table matching @id, - * run @handler on it. Return 0 if table found, return on if not. + * run @handler on it. + * + * Return 0 if table found, -errno if not. */ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler) { @@ -306,7 +307,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler) early_acpi_os_unmap_memory(table, tbl_size); return 0; } else - return 1; + return -ENODEV; } /* diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d9099b1..fecfbcd 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -460,7 +460,7 @@ struct acpi_table_header; static inline int acpi_table_parse(char *id, int (*handler)(struct acpi_table_header *)) { - return -1; + return -ENODEV; } static inline int acpi_nvs_register(__u64 start, __u64 size) -- 1.7.11.7