aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2014-03-24 10:11:22 -0400
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2014-03-24 10:11:22 -0400
commit6eb0d698efa9c2a35ec3ca958699717c603f85ee (patch)
tree78411273873ab7836280e43288ca6b8a44424d34 /drivers/block
parentddcb776286c091189a7b928188112470ec7e9efc (diff)
NVMe: Replace DEFINE_PCI_DEVICE_TABLE
Checkpatch has started warning against using DEFINE_PCI_DEVICE_TABLE, so replace it. Also update the copyright date and bump the module version number to 0.9. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/nvme-core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 04664cadadfa..e9495f0bfad3 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * NVM Express device driver 2 * NVM Express device driver
3 * Copyright (c) 2011, Intel Corporation. 3 * Copyright (c) 2011-2014, Intel Corporation.
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms and conditions of the GNU General Public License, 6 * under the terms and conditions of the GNU General Public License,
@@ -2601,7 +2601,7 @@ static const struct pci_error_handlers nvme_err_handler = {
2601/* Move to pci_ids.h later */ 2601/* Move to pci_ids.h later */
2602#define PCI_CLASS_STORAGE_EXPRESS 0x010802 2602#define PCI_CLASS_STORAGE_EXPRESS 0x010802
2603 2603
2604static DEFINE_PCI_DEVICE_TABLE(nvme_id_table) = { 2604static const struct pci_device_id nvme_id_table[] = {
2605 { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, 2605 { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
2606 { 0, } 2606 { 0, }
2607}; 2607};
@@ -2662,6 +2662,6 @@ static void __exit nvme_exit(void)
2662 2662
2663MODULE_AUTHOR("Matthew Wilcox <willy@linux.intel.com>"); 2663MODULE_AUTHOR("Matthew Wilcox <willy@linux.intel.com>");
2664MODULE_LICENSE("GPL"); 2664MODULE_LICENSE("GPL");
2665MODULE_VERSION("0.8"); 2665MODULE_VERSION("0.9");
2666module_init(nvme_init); 2666module_init(nvme_init);
2667module_exit(nvme_exit); 2667module_exit(nvme_exit);