Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757578Ab3HHFFk (ORCPT ); Thu, 8 Aug 2013 01:05:40 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:43984 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755517Ab3HHFFe (ORCPT ); Thu, 8 Aug 2013 01:05:34 -0400 X-IronPort-AV: E=Sophos;i="4.89,836,1367942400"; d="scan'208";a="8151107" From: Tang Chen To: robert.moore@intel.com, lv.zheng@intel.com, rjw@sisk.pl, lenb@kernel.org, tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, izumi.taku@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com, zhangyanfei@cn.fujitsu.com, yanghy@cn.fujitsu.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org Subject: [PATCH part2 3/4] acpi: Remove "continue" in macro INVALID_TABLE(). Date: Thu, 8 Aug 2013 13:03:58 +0800 Message-Id: <1375938239-18769-4-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1375938239-18769-1-git-send-email-tangchen@cn.fujitsu.com> References: <1375938239-18769-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/08 13:03:57, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/08 13:04:06, Serialize complete at 2013/08/08 13:04:06 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3639 Lines: 114 The macro INVALID_TABLE() is defined like this: #define INVALID_TABLE(x, path, name) \ { pr_err("ACPI OVERRIDE: " x " [%s%s]\n", path, name); continue; } And it is used like this: for (...) { ... if (...) INVALID_TABLE() ... } The "continue" in the macro makes the code hard to understand. Change it to the style like other macros: #define INVALID_TABLE(x, path, name) \ do { pr_err("ACPI OVERRIDE: " x " [%s%s]\n", path, name); } while (0) And also, INVALID_TABLE() is used to checkout acpi tables, so rename it to ACPI_INVALID_TABLE(). This is suggested by Toshi Kani . So after this patch, this macro should be used like this: for (...) { ... if (...) { ACPI_INVALID_TABLE() continue; } ... } Add the "continue" wherever the macro is called. (For now, it is only called in acpi_initrd_override().) The idea is from Yinghai Lu . Signed-off-by: Tang Chen Signed-off-by: Yinghai Lu Acked-by: Tejun Heo Acked-by: Rafael J. Wysocki Acked-by: Toshi Kani Reviewed-by: Zhang Yanfei --- drivers/acpi/osl.c | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 6ab2c35..3b8bab2 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -564,8 +564,8 @@ static const char * const table_sigs[] = { ACPI_SIG_RSDT, ACPI_SIG_XSDT, ACPI_SIG_SSDT, NULL }; /* Non-fatal errors: Affected tables/files are ignored */ -#define INVALID_TABLE(x, path, name) \ - { pr_err("ACPI OVERRIDE: " x " [%s%s]\n", path, name); continue; } +#define ACPI_INVALID_TABLE(x, path, name) \ + do { pr_err("ACPI OVERRIDE: " x " [%s%s]\n", path, name); } while (0) #define ACPI_HEADER_SIZE sizeof(struct acpi_table_header) @@ -593,9 +593,11 @@ void __init acpi_initrd_override(void *data, size_t size) data += offset; size -= offset; - if (file.size < sizeof(struct acpi_table_header)) - INVALID_TABLE("Table smaller than ACPI header", + if (file.size < sizeof(struct acpi_table_header)) { + ACPI_INVALID_TABLE("Table smaller than ACPI header", cpio_path, file.name); + continue; + } table = file.data; @@ -603,15 +605,21 @@ void __init acpi_initrd_override(void *data, size_t size) if (!memcmp(table->signature, table_sigs[sig], 4)) break; - if (!table_sigs[sig]) - INVALID_TABLE("Unknown signature", + if (!table_sigs[sig]) { + ACPI_INVALID_TABLE("Unknown signature", cpio_path, file.name); - if (file.size != table->length) - INVALID_TABLE("File length does not match table length", + continue; + } + if (file.size != table->length) { + ACPI_INVALID_TABLE("File length does not match table length", cpio_path, file.name); - if (acpi_table_checksum(file.data, table->length)) - INVALID_TABLE("Bad table checksum", + continue; + } + if (acpi_table_checksum(file.data, table->length)) { + ACPI_INVALID_TABLE("Bad table checksum", cpio_path, file.name); + continue; + } pr_info("%4.4s ACPI table found in initrd [%s%s][0x%x]\n", table->signature, cpio_path, file.name, table->length); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/