Commit 0b85f59d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Christoph Hellwig
Browse files

nvme-pci: Move enumeration by class to be last in the table 



It's unusual that we have enumeration by class in the middle of the table.
It might potentially be problematic in the future if we add another entry
after it.

So, move class matching entry to be the last in the ID table.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1cf7a12e

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -3187,7 +3187,6 @@ static const struct pci_device_id nvme_id_table[] = { 
				NVME_QUIRK_IGNORE_DEV_SUBNQN, },

	{ PCI_DEVICE(0x1c5c, 0x1504),   /* SK Hynix PC400 */

		.driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, },

	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001),

		.driver_data = NVME_QUIRK_SINGLE_VECTOR },

	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },
@@ -3195,6 +3194,8 @@ static const struct pci_device_id nvme_id_table[] = { 
		.driver_data = NVME_QUIRK_SINGLE_VECTOR |

				NVME_QUIRK_128_BYTES_SQES |

				NVME_QUIRK_SHARED_TAGS },



	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, nvme_id_table);

CRA Git | Maintained and supported by SUSTech CRA and CCSE