diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 7012f3e..f682e59 100644
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -93,11 +93,7 @@ sub get_smart_data {
     my $smartdata = {};
     my $type;
 
-    if ($disk =~ m!^/dev/(nvme\d+n\d+)$!) {
-	my $info = get_sysdir_info("/sys/block/$1");
-	$disk = "/dev/".($info->{device}
-	    or die "failed to get nvme controller device for $disk\n");
-    }
+    $disk =~ s/n\d+$// if $disk =~ m!^/dev/nvme\d+n\d+$!;
 
     my $cmd = [$SMARTCTL, '-H'];
     push @$cmd, '-A', '-f', 'brief' if !$healthonly;
@@ -377,10 +373,6 @@ sub get_sysdir_info {
     $data->{vendor} = file_read_firstline("$sysdir/device/vendor") || 'unknown';
     $data->{model} = file_read_firstline("$sysdir/device/model") || 'unknown';
 
-    if (defined(my $device = readlink("$sysdir/device"))) {
-	($data->{device}) = $device =~ m!([^/]+)$!; # strip directory and untaint
-    }
-
     return $data;
 }
 
diff --git a/test/disk_tests/nvme_smart/nvme0n1/device b/test/disk_tests/nvme_smart/nvme0n1/device
deleted file mode 120000
index e890f3e..0000000
--- a/test/disk_tests/nvme_smart/nvme0n1/device
+++ /dev/null
@@ -1 +0,0 @@
-../nvme0
\ No newline at end of file
diff --git a/test/disk_tests/nvme_smart/nvme0/model b/test/disk_tests/nvme_smart/nvme0n1/device/model
similarity index 100%
rename from test/disk_tests/nvme_smart/nvme0/model
rename to test/disk_tests/nvme_smart/nvme0n1/device/model