Commit c4485252 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

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: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent af5d6f7b

drivers/nvme/host/core.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE