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>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 0fc99f0f257110a063f3e58722b2f0ec08da655e..2c58f159ac61c43ec08f3f8c8ab32d77c8cd7609 100644 (file)
--- 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 = {
        .reset_notify   = nvme_reset_notify,
 };
 
-/* Move to pci_ids.h later */
-#define PCI_CLASS_STORAGE_EXPRESS      0x010802
-
 static const struct pci_device_id nvme_id_table[] = {
        { PCI_VDEVICE(INTEL, 0x0953),
                .driver_data = NVME_QUIRK_STRIPE_SIZE |

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c58752fe16c43110b736a0e21fe9a702459d8a34..a5e6c7bca610cfcf24198fc85750c171099faaee 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -23,8 +23,10 @@
 #define PCI_CLASS_STORAGE_SATA         0x0106
 #define PCI_CLASS_STORAGE_SATA_AHCI    0x010601
 #define PCI_CLASS_STORAGE_SAS          0x0107
+#define PCI_CLASS_STORAGE_EXPRESS      0x010802
 #define PCI_CLASS_STORAGE_OTHER                0x0180
 
+
 #define PCI_BASE_CLASS_NETWORK         0x02
 #define PCI_CLASS_NETWORK_ETHERNET     0x0200
 #define PCI_CLASS_NETWORK_TOKEN_RING   0x0201