It would make sense to still add: if (ctrl->state == NVME_CTRL_DELETING || ctrl->state == NVME_CTRL_DEAD) return inside nvme_configure_apst at the top irrespective of this change.
I'm not sure what is the value given that it is taken care of in .queue_rq?