nvme: Cleanup and rename nvme_block_nr()