| Message ID | 20201215163531.21446-1-info@metux.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5ae96d779ff3eeb2977919ff311a6c8849943c2d |
| Headers | show |
| Series | drivers: nvdimm: cleanup include of badblocks.h | expand |
On Tue, Dec 15, 2020 at 8:36 AM Enrico Weigelt, metux IT consult <info@metux.net> wrote: > > * drivers/nvdimm/core.c doesn't use anything from badblocks.h on its own, > thus including it isn't needed. There's indeed indirect use, via funcs > in nd.h, but this one already includes badblocks.h. > > * drivers/nvdimm/claim.c calls stuff from badblocks.h and therefore should > include it on its own (instead of relying any other header doing that) > > * drivers/nvdimm/btt.h doesn't really need anything from badblocks.h and > can easily live with a forward declaration of struct badblocks (just having > pointers to it, but not dereferencing it anywhere) Thanks, looks ok to me. It was commit aa9ad44a42b4 ("libnvdimm: move poison list functions to a new 'badrange' file") that left the straggling include in core.c.
diff --git a/drivers/nvdimm/btt.h b/drivers/nvdimm/btt.h index 2e258bee7db2..aa53e0b769bd 100644 --- a/drivers/nvdimm/btt.h +++ b/drivers/nvdimm/btt.h @@ -7,7 +7,6 @@ #ifndef _LINUX_BTT_H #define _LINUX_BTT_H -#include <linux/badblocks.h> #include <linux/types.h> #define BTT_SIG_LEN 16 @@ -197,6 +196,8 @@ struct arena_info { int log_index[2]; }; +struct badblocks; + /** * struct btt - handle for a BTT instance * @btt_disk: Pointer to the gendisk for BTT device diff --git a/drivers/nvdimm/claim.c b/drivers/nvdimm/claim.c index 5a7c80053c62..030dbde6b088 100644 --- a/drivers/nvdimm/claim.c +++ b/drivers/nvdimm/claim.c @@ -4,6 +4,7 @@ */ #include <linux/device.h> #include <linux/sizes.h> +#include <linux/badblocks.h> #include "nd-core.h" #include "pmem.h" #include "pfn.h" diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c index c21ba0602029..7de592d7eff4 100644 --- a/drivers/nvdimm/core.c +++ b/drivers/nvdimm/core.c @@ -3,7 +3,6 @@ * Copyright(c) 2013-2015 Intel Corporation. All rights reserved. */ #include <linux/libnvdimm.h> -#include <linux/badblocks.h> #include <linux/suspend.h> #include <linux/export.h> #include <linux/module.h>
* drivers/nvdimm/core.c doesn't use anything from badblocks.h on its own, thus including it isn't needed. There's indeed indirect use, via funcs in nd.h, but this one already includes badblocks.h. * drivers/nvdimm/claim.c calls stuff from badblocks.h and therefore should include it on its own (instead of relying any other header doing that) * drivers/nvdimm/btt.h doesn't really need anything from badblocks.h and can easily live with a forward declaration of struct badblocks (just having pointers to it, but not dereferencing it anywhere) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> --- drivers/nvdimm/btt.h | 3 ++- drivers/nvdimm/claim.c | 1 + drivers/nvdimm/core.c | 1 - 3 files changed, 3 insertions(+), 2 deletions(-)