Re: [PATCH part2 3/4] acpi: Remove "continue" in macro INVALID_TABLE().
On 08/12/2013 10:21 PM, Tejun Heo wrote: On Thu, Aug 08, 2013 at 07:09:53AM -0700, Joe Perches wrote: If you really think that the #define is better, use something like HW_ERR does and embed that #define in the pr_err. #define ACPI_OVERRIDE "ACPI OVERRIDE: " pr_err(ACPI_OVERRIDE "Table smaller than ACPI header [%s%s]\n", cpio_path, file.name); It's only used a few times by a single file so I think it's unnecessary. I agree with Joe here. Just doing normal pr_err() should be enough. You can use pr_fmt() to add headers but given that we aren't talking about huge number of printks, that probably is an overkill too. OK, followed. Thanks. -- 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/
Re: [PATCH part2 3/4] acpi: Remove "continue" in macro INVALID_TABLE().
On Thu, Aug 08, 2013 at 07:09:53AM -0700, Joe Perches wrote: > If you really think that the #define is better, use > something like HW_ERR does and embed that #define > in the pr_err. > > #define ACPI_OVERRIDE "ACPI OVERRIDE: " > > pr_err(ACPI_OVERRIDE "Table smaller than ACPI header [%s%s]\n", > cpio_path, file.name); > > It's only used a few times by a single file so > I think it's unnecessary. I agree with Joe here. Just doing normal pr_err() should be enough. You can use pr_fmt() to add headers but given that we aren't talking about huge number of printks, that probably is an overkill too. Thanks. -- tejun -- 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/
Re: [PATCH part2 3/4] acpi: Remove "continue" in macro INVALID_TABLE().
On Thu, 2013-08-08 at 20:18 +0800, Tang Chen wrote:
> Hi Joe,
Hello Tang.
> On 08/08/2013 01:27 PM, Joe Perches wrote:
> > On Thu, 2013-08-08 at 13:03 +0800, Tang Chen wrote:
> >
> >> 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)
> >
> > Single statement macros do _not_ need to use
> > "do { foo(); } while (0)"
> > and should be written as
> > "foo()"
>
> OK, will remove the do {} while (0).
>
> But I think we'd better keep the macro, or rename it to something
> more meaningful. At least we can use it to avoid adding "ACPI OVERRIDE:"
> prefix every time. Maybe this is why it is defined.
No, it's just silly.
If you really think that the #define is better, use
something like HW_ERR does and embed that #define
in the pr_err.
#define ACPI_OVERRIDE "ACPI OVERRIDE: "
pr_err(ACPI_OVERRIDE "Table smaller than ACPI header [%s%s]\n",
cpio_path, file.name);
It's only used a few times by a single file so
I think it's unnecessary.
--
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/
Re: [PATCH part2 3/4] acpi: Remove "continue" in macro INVALID_TABLE().
Hi Joe,
On 08/08/2013 01:27 PM, Joe Perches wrote:
On Thu, 2013-08-08 at 13:03 +0800, Tang Chen wrote:
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)
Single statement macros do _not_ need to use
"do { foo(); } while (0)"
and should be written as
"foo()"
OK, will remove the do {} while (0).
But I think we'd better keep the macro, or rename it to something
more meaningful. At least we can use it to avoid adding "ACPI OVERRIDE:"
prefix every time. Maybe this is why it is defined.
Thanks. :)
diff --git 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)
Just remove the silly macro altogether
@@ -593,9 +593,11 @@ void __init acpi_initrd_override(void *data, size_t size)
[]
- 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);
and use the normal style
pr_err("ACPI OVERRIDE: Table smaller than ACPI header
[%s%s]\n",
cpio_path, file.name);
@@ -603,15 +605,21 @@ void __init acpi_initrd_override(void *data, size_t size)
etc...
--
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/
Re: [PATCH part2 3/4] acpi: Remove "continue" in macro INVALID_TABLE().
On Thu, 2013-08-08 at 13:03 +0800, Tang Chen wrote:
> 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)
Single statement macros do _not_ need to use
"do { foo(); } while (0)"
and should be written as
"foo()"
> diff --git 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)
Just remove the silly macro altogether
> @@ -593,9 +593,11 @@ void __init acpi_initrd_override(void *data, size_t size)
[]
> - 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);
and use the normal style
pr_err("ACPI OVERRIDE: Table smaller than ACPI header
[%s%s]\n",
cpio_path, file.name);
> @@ -603,15 +605,21 @@ void __init acpi_initrd_override(void *data, size_t
> size)
etc...
--
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/
