aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2015-02-19 16:01:59 -0500
committerKeith Busch <keith.busch@intel.com>2015-02-19 18:15:38 -0500
commit483285184059b3f5b3a5707977349528abc82441 (patch)
treef8fce6dfa6c61aac760cbfb2ba8c481c8d6b5681
parent9ac16938ab784101631c32c6de825f7ebea08a48 (diff)
NVMe: Remove unused variables
We don't track queues in a llist, subscribe to hot-cpu notifications, or internally retry commands. Delete the unused artifacts. Signed-off-by: Keith Busch <keith.busch@intel.com>
-rw-r--r--drivers/block/nvme-core.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 0f388206b15b..cf2d8e3c93a8 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -49,7 +49,6 @@
49#define CQ_SIZE(depth) (depth * sizeof(struct nvme_completion)) 49#define CQ_SIZE(depth) (depth * sizeof(struct nvme_completion))
50#define ADMIN_TIMEOUT (admin_timeout * HZ) 50#define ADMIN_TIMEOUT (admin_timeout * HZ)
51#define SHUTDOWN_TIMEOUT (shutdown_timeout * HZ) 51#define SHUTDOWN_TIMEOUT (shutdown_timeout * HZ)
52#define IOD_TIMEOUT (retry_time * HZ)
53 52
54static unsigned char admin_timeout = 60; 53static unsigned char admin_timeout = 60;
55module_param(admin_timeout, byte, 0644); 54module_param(admin_timeout, byte, 0644);
@@ -59,10 +58,6 @@ unsigned char nvme_io_timeout = 30;
59module_param_named(io_timeout, nvme_io_timeout, byte, 0644); 58module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
60MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O"); 59MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
61 60
62static unsigned char retry_time = 30;
63module_param(retry_time, byte, 0644);
64MODULE_PARM_DESC(retry_time, "time in seconds to retry failed I/O");
65
66static unsigned char shutdown_timeout = 5; 61static unsigned char shutdown_timeout = 5;
67module_param(shutdown_timeout, byte, 0644); 62module_param(shutdown_timeout, byte, 0644);
68MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown"); 63MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");
@@ -81,7 +76,6 @@ static LIST_HEAD(dev_list);
81static struct task_struct *nvme_thread; 76static struct task_struct *nvme_thread;
82static struct workqueue_struct *nvme_workq; 77static struct workqueue_struct *nvme_workq;
83static wait_queue_head_t nvme_kthread_wait; 78static wait_queue_head_t nvme_kthread_wait;
84static struct notifier_block nvme_nb;
85 79
86static struct class *nvme_class; 80static struct class *nvme_class;
87 81
@@ -102,7 +96,6 @@ struct async_cmd_info {
102 * commands and one for I/O commands). 96 * commands and one for I/O commands).
103 */ 97 */
104struct nvme_queue { 98struct nvme_queue {
105 struct llist_node node;
106 struct device *q_dmadev; 99 struct device *q_dmadev;
107 struct nvme_dev *dev; 100 struct nvme_dev *dev;
108 char irqname[24]; /* nvme4294967295-65535\0 */ 101 char irqname[24]; /* nvme4294967295-65535\0 */
@@ -3203,7 +3196,6 @@ static int __init nvme_init(void)
3203static void __exit nvme_exit(void) 3196static void __exit nvme_exit(void)
3204{ 3197{
3205 pci_unregister_driver(&nvme_driver); 3198 pci_unregister_driver(&nvme_driver);
3206 unregister_hotcpu_notifier(&nvme_nb);
3207 unregister_blkdev(nvme_major, "nvme"); 3199 unregister_blkdev(nvme_major, "nvme");
3208 destroy_workqueue(nvme_workq); 3200 destroy_workqueue(nvme_workq);
3209 class_destroy(nvme_class); 3201 class_destroy(nvme_class);