Commit 0a9f8500 authored by Keith Busch's avatar Keith Busch Committed by Christoph Hellwig

nvme: remove nssa from struct nvme_ctrl

The reported number of streams is not used outside the function that
gets it, so no need to stash it in the controller structure. Use a local
variable instead.
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1c3adf0d
...@@ -790,6 +790,7 @@ static int nvme_get_stream_params(struct nvme_ctrl *ctrl, ...@@ -790,6 +790,7 @@ static int nvme_get_stream_params(struct nvme_ctrl *ctrl,
static int nvme_configure_directives(struct nvme_ctrl *ctrl) static int nvme_configure_directives(struct nvme_ctrl *ctrl)
{ {
struct streams_directive_params s; struct streams_directive_params s;
u16 nssa;
int ret; int ret;
if (!(ctrl->oacs & NVME_CTRL_OACS_DIRECTIVES)) if (!(ctrl->oacs & NVME_CTRL_OACS_DIRECTIVES))
...@@ -805,16 +806,16 @@ static int nvme_configure_directives(struct nvme_ctrl *ctrl) ...@@ -805,16 +806,16 @@ static int nvme_configure_directives(struct nvme_ctrl *ctrl)
if (ret) if (ret)
goto out_disable_stream; goto out_disable_stream;
ctrl->nssa = le16_to_cpu(s.nssa); nssa = le16_to_cpu(s.nssa);
if (ctrl->nssa < BLK_MAX_WRITE_HINTS - 1) { if (nssa < BLK_MAX_WRITE_HINTS - 1) {
dev_info(ctrl->device, "too few streams (%u) available\n", dev_info(ctrl->device, "too few streams (%u) available\n",
ctrl->nssa); nssa);
/* this condition is not an error: streams are optional */ /* this condition is not an error: streams are optional */
ret = 0; ret = 0;
goto out_disable_stream; goto out_disable_stream;
} }
ctrl->nr_streams = min_t(u16, ctrl->nssa, BLK_MAX_WRITE_HINTS - 1); ctrl->nr_streams = min_t(u16, nssa, BLK_MAX_WRITE_HINTS - 1);
dev_info(ctrl->device, "Using %u streams\n", ctrl->nr_streams); dev_info(ctrl->device, "Using %u streams\n", ctrl->nr_streams);
return 0; return 0;
......
...@@ -280,7 +280,6 @@ struct nvme_ctrl { ...@@ -280,7 +280,6 @@ struct nvme_ctrl {
u16 crdt[3]; u16 crdt[3];
u16 oncs; u16 oncs;
u16 oacs; u16 oacs;
u16 nssa;
u16 nr_streams; u16 nr_streams;
u16 sqsize; u16 sqsize;
u32 max_namespaces; u32 max_namespaces;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment