nvme: move the Samsung X5 quirk entry to the core quirks
authorChristoph Hellwig <hch@lst.de>
Fri, 17 Jun 2022 08:29:42 +0000 (10:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Jun 2022 07:03:26 +0000 (09:03 +0200)
commite3ea126c513c93bc4af1d45044e34e3238ac0577
tree394c009a60214ac01d7cef5d493c4177a3305376
parent1057d42602cb610b06e6ac0495483254e4812d09
nvme: move the Samsung X5 quirk entry to the core quirks

[ Upstream commit e6487833182a8a0187f0292aca542fc163ccd03e ]

This device shares the PCI ID with the Samsung 970 Evo Plus that
does not need or want the quirks.  Move the the quirk entry to the
core table based on the model number instead.

Fixes: bc360b0b1611 ("nvme-pci: add quirks for Samsung X5 SSDs")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Pankaj Raghav <p.raghav@samsung.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/nvme/host/core.c
drivers/nvme/host/pci.c