summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhang Yunkai <zhang.yunkai@zte.com.cn>2021-04-13 10:52:56 +0000
committerJens Axboe <axboe@kernel.dk>2021-04-13 09:16:12 -0600
commit655cdafdec1105d0552aa19ffb5ffef7aead1548 (patch)
treeb36124c9f228db6c65538a40f05ead0fb3e38339
parent1c6b0bc73fac9306462bd4794d00520690e97ef8 (diff)
downloadlinux-655cdafdec1105d0552aa19ffb5ffef7aead1548.tar.bz2
lightnvm: remove duplicate include in lightnvm.h
'linux/blkdev.h' and 'uapi/linux/lightnvm.h' included in 'lightnvm.h' is duplicated.It is also included in the 5th and 7th line. Signed-off-by: Zhang Yunkai <zhang.yunkai@zte.com.cn> Signed-off-by: Matias Bjørling <matias.bjorling@wdc.com> Link: https://lore.kernel.org/r/20210413105257.159260-4-matias.bjorling@wdc.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--include/linux/lightnvm.h2
-rw-r--r--include/uapi/linux/lightnvm.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index 1db223710b28..0908abda9c1b 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -112,10 +112,8 @@ struct nvm_dev_ops {
#ifdef CONFIG_NVM
-#include <linux/blkdev.h>
#include <linux/file.h>
#include <linux/dmapool.h>
-#include <uapi/linux/lightnvm.h>
enum {
/* HW Responsibilities */
diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h
index ead2e72e5c88..2745afd9b8fa 100644
--- a/include/uapi/linux/lightnvm.h
+++ b/include/uapi/linux/lightnvm.h
@@ -22,7 +22,6 @@
#ifdef __KERNEL__
#include <linux/const.h>
-#include <linux/ioctl.h>
#else /* __KERNEL__ */
#include <stdio.h>
#include <sys/ioctl.h>