linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mlin@kernel.org (Ming Lin)
Subject: [PATCH 1/4] nvme: move timeout variables to core.c and export it
Date: Mon,  8 Feb 2016 14:24:41 -0800	[thread overview]
Message-ID: <1454970284-29543-2-git-send-email-mlin@kernel.org> (raw)
In-Reply-To: <1454970284-29543-1-git-send-email-mlin@kernel.org>

Signed-off-by: Ming Lin <ming.l at ssi.samsung.com>
---
 drivers/nvme/host/core.c | 14 ++++++++++++++
 drivers/nvme/host/pci.c  | 12 ------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c5bf001..3faed20 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -33,6 +33,20 @@
 
 #define NVME_MINORS		(1U << MINORBITS)
 
+unsigned char admin_timeout = 60;
+module_param(admin_timeout, byte, 0644);
+MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
+EXPORT_SYMBOL_GPL(admin_timeout);
+
+unsigned char nvme_io_timeout = 30;
+module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
+MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
+EXPORT_SYMBOL_GPL(nvme_io_timeout);
+
+unsigned char shutdown_timeout = 5;
+module_param(shutdown_timeout, byte, 0644);
+MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");
+
 static int nvme_major;
 module_param(nvme_major, int, 0);
 
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 72ef832..deba7ac 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -57,18 +57,6 @@
 #define NVME_NR_AEN_COMMANDS	1
 #define NVME_AQ_BLKMQ_DEPTH	(NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
 
-unsigned char admin_timeout = 60;
-module_param(admin_timeout, byte, 0644);
-MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
-
-unsigned char nvme_io_timeout = 30;
-module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
-MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
-
-unsigned char shutdown_timeout = 5;
-module_param(shutdown_timeout, byte, 0644);
-MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");
-
 static int use_threaded_interrupts;
 module_param(use_threaded_interrupts, int, 0);
 
-- 
1.9.1

  reply	other threads:[~2016-02-08 22:24 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-08 22:24 [PATCH 0/4] nvme: split pci module out of core module Ming Lin
2016-02-08 22:24 ` Ming Lin [this message]
2016-02-09  9:25   ` [PATCH 1/4] nvme: move timeout variables to core.c and export it Christoph Hellwig
2016-02-09 12:43   ` Johannes Thumshirn
2016-02-09 12:46   ` Matias Bjørling
2016-02-08 22:24 ` [PATCH 2/4] nvme: export more symbols Ming Lin
2016-02-09  9:25   ` Christoph Hellwig
2016-02-09 12:42   ` Johannes Thumshirn
2016-02-09 12:56   ` Matias Bjørling
2016-02-09 13:07     ` Christoph Hellwig
2016-02-08 22:24 ` [PATCH 3/4] nvme: split dev_list_lock Ming Lin
2016-02-09  9:26   ` Christoph Hellwig
2016-02-09 12:41   ` Johannes Thumshirn
2016-02-09 13:14     ` Christoph Hellwig
2016-02-09 13:34       ` Johannes Thumshirn
2016-02-08 22:24 ` [PATCH 4/4] nvme: split pci module out of core module Ming Lin
2016-02-09  8:56   ` Johannes Thumshirn
2016-02-09 18:26     ` Ming Lin
2016-02-10 13:35       ` Michal Marek
2016-02-09  9:26   ` Christoph Hellwig
2016-02-10  0:09     ` Ming Lin
2016-02-10 15:12   ` Keith Busch
2016-02-10 15:31     ` Ming Lin
2016-02-09  9:24 ` [PATCH 0/4] " Christoph Hellwig

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=1454970284-29543-2-git-send-email-mlin@kernel.org \
    --to=mlin@kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).