nvme: move a few things out of nvme_update_disk_info