From: Chaitanya Kulkarni Date: Thu, 1 Oct 2020 18:54:32 +0000 (-0700) Subject: nvme-core: remove extra condition for vwc X-Git-Tag: v5.10-rc1~165^2~1^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4485252cf36ae62c8bf12c4aede72345cad0d2b;p=thirdparty%2Fkernel%2Flinux.git nvme-core: remove extra condition for vwc In nvme_set_queue_limits() we initialize vwc to false and later add a condition to set vwc true. The value of the vwc can be declare initialized which makes all the blk_queue_XXX() calls uniform. Signed-off-by: Chaitanya Kulkarni Reviewed-by: Keith Busch Signed-off-by: Christoph Hellwig --- diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 2e505cdf051ec..e85f6304efd72 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1970,7 +1970,7 @@ static int nvme_configure_metadata(struct nvme_ns *ns, struct nvme_id_ns *id) static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, struct request_queue *q) { - bool vwc = false; + bool vwc = ctrl->vwc & NVME_CTRL_VWC_PRESENT; if (ctrl->max_hw_sectors) { u32 max_segments = @@ -1982,8 +1982,6 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, } blk_queue_virt_boundary(q, NVME_CTRL_PAGE_SIZE - 1); blk_queue_dma_alignment(q, 7); - if (ctrl->vwc & NVME_CTRL_VWC_PRESENT) - vwc = true; blk_queue_write_cache(q, vwc, vwc); }