[PATCH 3/3] acpi: Kill macro INVALID_TABLE().
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.
And also, this macro is only used several times in a single file.
As suggested by Joe Perches , we can remote it and
use pr_err directly.
So after this patch, this macro is removed, and pr_err() is used
like this:
for (...) {
...
if (...) {
pr_err("ACPI OVERRIDE: ..");
continue;
}
...
}
Signed-off-by: Tang Chen
Suggested-by: Joe Perches
Acked-by: Tejun Heo
Acked-by: Rafael J. Wysocki
Acked-by: Toshi Kani
Reviewed-by: Zhang Yanfei
---
drivers/acpi/osl.c | 36
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6ab2c35..e7effc1 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -563,10 +563,6 @@ static const char * const table_sigs[] = {
ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT, ACPI_SIG_PSDT,
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_HEADER_SIZE sizeof(struct acpi_table_header)
/* Must not increase 10 or needs code modification below */
@@ -593,9 +589,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",
- cpio_path, file.name);
+ if (file.size < sizeof(struct acpi_table_header)) {
+ pr_err("ACPI OVERRIDE: Table smaller than ACPI header
[%s%s]\n",
+ cpio_path, file.name);
+ continue;
+ }
table = file.data;
@@ -603,15 +601,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",
- cpio_path, file.name);
- if (file.size != table->length)
- 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",
- cpio_path, file.name);
+ if (!table_sigs[sig]) {
+ pr_err("ACPI OVERRIDE: Unknown signature [%s%s]\n",
+ cpio_path, file.name);
+ continue;
+ }
+ if (file.size != table->length) {
+ pr_err("ACPI OVERRIDE: File length does not match table
length [%s%s]\n",
+ cpio_path, file.name);
+ continue;
+ }
+ if (acpi_table_checksum(file.data, table->length)) {
+ pr_err("ACPI OVERRIDE: Bad table checksum [%s%s]\n",
+ 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH 3/3] acpi: Kill macro INVALID_TABLE().
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.
And also, this macro is only used several times in a single file.
As suggested by Joe Perches j...@perches.com, we can remote it and
use pr_err directly.
So after this patch, this macro is removed, and pr_err() is used
like this:
for (...) {
...
if (...) {
pr_err(ACPI OVERRIDE: ..);
continue;
}
...
}
Signed-off-by: Tang Chen tangc...@cn.fujitsu.com
Suggested-by: Joe Perches j...@perches.com
Acked-by: Tejun Heo t...@kernel.org
Acked-by: Rafael J. Wysocki rafael.j.wyso...@intel.com
Acked-by: Toshi Kani toshi.k...@hp.com
Reviewed-by: Zhang Yanfei zhangyan...@cn.fujitsu.com
---
drivers/acpi/osl.c | 36
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 6ab2c35..e7effc1 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -563,10 +563,6 @@ static const char * const table_sigs[] = {
ACPI_SIG_WDRT, ACPI_SIG_DSDT, ACPI_SIG_FADT, ACPI_SIG_PSDT,
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_HEADER_SIZE sizeof(struct acpi_table_header)
/* Must not increase 10 or needs code modification below */
@@ -593,9 +589,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,
- cpio_path, file.name);
+ if (file.size sizeof(struct acpi_table_header)) {
+ pr_err(ACPI OVERRIDE: Table smaller than ACPI header
[%s%s]\n,
+ cpio_path, file.name);
+ continue;
+ }
table = file.data;
@@ -603,15 +601,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,
- cpio_path, file.name);
- if (file.size != table-length)
- 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,
- cpio_path, file.name);
+ if (!table_sigs[sig]) {
+ pr_err(ACPI OVERRIDE: Unknown signature [%s%s]\n,
+ cpio_path, file.name);
+ continue;
+ }
+ if (file.size != table-length) {
+ pr_err(ACPI OVERRIDE: File length does not match table
length [%s%s]\n,
+ cpio_path, file.name);
+ continue;
+ }
+ if (acpi_table_checksum(file.data, table-length)) {
+ pr_err(ACPI OVERRIDE: Bad table checksum [%s%s]\n,
+ 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 majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
