NVMe: fix up last compile warnings