nvme/032,050: ensure that test target NVME device has PCI transport

The test case nvme/032 sets the value "pci" to the global variable
nvme_trtype to ensure that the test case runs only when TEST_DEV is a
NVME device using PCI transport. However, this approach was not working
as intended since the global variable is not referred to. The test case
was run for NVME devices using non-PCI transport, and reported false-
positive failures.

Commit c634b8a ("nvme/032: skip on non-PCI devices") introduced the
helper function _require_test_dev_is_nvme_pci(). This function ensures
that the test case nvme/032 is skipped when TEST_DEV is not a NVME
device with PCI transport. Despite this improvement, the unused global
variable nvme_trtype continued to be set. Remove the unnecessary
substitution code.

In the same manner, the test case nvme/050 is expected to be run only
when TEST_DEV is a NVME device with PCI transport. It also sets the
global variable nvme_trtype, but it caused unexpected failure as
reported in the Link. Modify the test case to use
_require_test_dev_is_nvme_pci() to ensure the requirement.

Fixes: c634b8a ("nvme/032: skip on non-PCI devices")
Link: linux-blktests#214
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>

Author: kawasaki

tests/nvme/032

@@ -11,9 +11,6 @@
 
 . tests/nvme/rc
 
-#restrict test to nvme-pci only
-nvme_trtype=pci
-
 DESCRIPTION="test nvme pci adapter rescan/reset/remove during I/O"
 QUICK=1
 CAN_BE_ZONED=1

tests/nvme/050

@@ -10,15 +10,16 @@
 DESCRIPTION="test nvme-pci timeout with fio jobs"
 CAN_BE_ZONED=1
 
-#restrict test to nvme-pci only
-nvme_trtype=pci
-
 requires() {
 	_have_fio
 	_nvme_requires
 	_have_kernel_options FAIL_IO_TIMEOUT FAULT_INJECTION_DEBUG_FS
 }
 
+device_requires() {
+	_require_test_dev_is_nvme_pci
+}
+
 test_device() {
 	local nvme_ns
 	local pdev