All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matias Bjørling" <mb@lightnvm.io>
To: axboe@kernel.dk
Cc: linux-block@vger.kernel.org,
	"Zhang Yunkai" <zhang.yunkai@zte.com.cn>,
	"Matias Bjørling" <matias.bjorling@wdc.com>
Subject: [PATCH 3/4] lightnvm: remove duplicate include in lightnvm.h
Date: Tue, 13 Apr 2021 10:52:56 +0000	[thread overview]
Message-ID: <20210413105257.159260-4-matias.bjorling@wdc.com> (raw)
In-Reply-To: <20210413105257.159260-1-matias.bjorling@wdc.com>

From: Zhang Yunkai <zhang.yunkai@zte.com.cn>

'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>
---
 include/linux/lightnvm.h      | 2 --
 include/uapi/linux/lightnvm.h | 1 -
 2 files changed, 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>
-- 
2.25.1


  parent reply	other threads:[~2021-04-13 10:53 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-13 10:52 [PATCH 0/4] lightnvm pull request Matias Bjørling
2021-04-13 10:52 ` [PATCH 1/4] lightnvm: use kobj_to_dev() Matias Bjørling
2021-04-13 10:52 ` [PATCH 2/4] lightnvm: return the correct return value Matias Bjørling
2021-04-13 10:52 ` Matias Bjørling [this message]
2021-04-13 10:52 ` [PATCH 4/4] lightnvm: deprecated OCSSD support and schedule it for removal in Linux 5.15 Matias Bjørling
2021-04-13 15:16 ` [PATCH 0/4] lightnvm pull request Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210413105257.159260-4-matias.bjorling@wdc.com \
    --to=mb@lightnvm.io \
    --cc=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=matias.bjorling@wdc.com \
    --cc=zhang.yunkai@zte.com.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.