Re: [PATCH] libnvdimm/nfit_test: Fix acpi_handle redefinition

From: Dan Williams
Date: Wed Sep 18 2019 - 19:40:41 EST


On Tue, Sep 17, 2019 at 9:23 PM Nathan Chancellor
<natechancellor@xxxxxxxxx> wrote:
>
> After commit 62974fc389b3 ("libnvdimm: Enable unit test infrastructure
> compile checks"), clang warns:
>
> In file included from
> ../drivers/nvdimm/../../tools/testing/nvdimm/test/iomap.c:15:
> ../drivers/nvdimm/../../tools/testing/nvdimm/test/nfit_test.h:206:15:
> warning: redefinition of typedef 'acpi_handle' is a C11 feature
> [-Wtypedef-redefinition]
> typedef void *acpi_handle;
> ^
> ../include/acpi/actypes.h:424:15: note: previous definition is here
> typedef void *acpi_handle; /* Actually a ptr to a NS Node */
> ^
> 1 warning generated.
>
> The include chain:
>
> iomap.c ->
> linux/acpi.h ->
> acpi/acpi.h ->
> acpi/actypes.h
> nfit_test.h
>
> Avoid this by including linux/acpi.h in nfit_test.h, which allows us to
> remove both the typedef and the forward declaration of acpi_object.
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/660
> Signed-off-by: Nathan Chancellor <natechancellor@xxxxxxxxx>
> ---
>
> I know that every maintainer has their own thing with the number of
> includes in each header file; this issue can be solved in a various
> number of ways, I went with the smallest diff stat. Please solve it in a
> different way if you see fit :)
>

Looks good to me. I'll pick this up for a post v5.4-rc1 push.