aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2016-12-02 13:31:01 -0500
committerTejun Heo <tj@kernel.org>2016-12-05 14:31:23 -0500
commita2e7eefd5618e0f75bae2eb5c9387ea2f627b6ca (patch)
tree014f09728fea17dfac786c25616b6f994e679609
parentb986723c4c937033957ef0971e54effd02afb451 (diff)
nvme: move NVMe class code to pci_ids.h
We'll need to check for it in the AHCI drivers (yes, really) soon. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/nvme/host/pci.c3
-rw-r--r--include/linux/pci_ids.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 0fc99f0f2571..2c58f159ac61 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2064,9 +2064,6 @@ static const struct pci_error_handlers nvme_err_handler = {
2064 .reset_notify = nvme_reset_notify, 2064 .reset_notify = nvme_reset_notify,
2065}; 2065};
2066 2066
2067/* Move to pci_ids.h later */
2068#define PCI_CLASS_STORAGE_EXPRESS 0x010802
2069
2070static const struct pci_device_id nvme_id_table[] = { 2067static const struct pci_device_id nvme_id_table[] = {
2071 { PCI_VDEVICE(INTEL, 0x0953), 2068 { PCI_VDEVICE(INTEL, 0x0953),
2072 .driver_data = NVME_QUIRK_STRIPE_SIZE | 2069 .driver_data = NVME_QUIRK_STRIPE_SIZE |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c58752fe16c4..a5e6c7bca610 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -23,8 +23,10 @@
23#define PCI_CLASS_STORAGE_SATA 0x0106 23#define PCI_CLASS_STORAGE_SATA 0x0106
24#define PCI_CLASS_STORAGE_SATA_AHCI 0x010601 24#define PCI_CLASS_STORAGE_SATA_AHCI 0x010601
25#define PCI_CLASS_STORAGE_SAS 0x0107 25#define PCI_CLASS_STORAGE_SAS 0x0107
26#define PCI_CLASS_STORAGE_EXPRESS 0x010802
26#define PCI_CLASS_STORAGE_OTHER 0x0180 27#define PCI_CLASS_STORAGE_OTHER 0x0180
27 28
29
28#define PCI_BASE_CLASS_NETWORK 0x02 30#define PCI_BASE_CLASS_NETWORK 0x02
29#define PCI_CLASS_NETWORK_ETHERNET 0x0200 31#define PCI_CLASS_NETWORK_ETHERNET 0x0200
30#define PCI_CLASS_NETWORK_TOKEN_RING 0x0201 32#define PCI_CLASS_NETWORK_TOKEN_RING 0x0201