diff options
author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2014-06-13 10:54:21 -0400 |
---|---|---|
committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2014-06-13 10:54:21 -0400 |
commit | ef351b97dedaa7a6e257ed4f554718e384d8786b (patch) | |
tree | d4dbb7824e2c631a948bef6e86d629e850ed61be /drivers/block | |
parent | 3d69bb6e4699251102dc145b7800dd012ddec375 (diff) |
NVMe: Use Log Page constants in SCSI emulation
The nvme-scsi file defined its own Log Page constant. Use the
newly-defined one from the header file instead.
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/nvme-scsi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c index 4fc25b980535..24308ae8abf5 100644 --- a/drivers/block/nvme-scsi.c +++ b/drivers/block/nvme-scsi.c | |||
@@ -239,7 +239,6 @@ static int sg_version_num = 30534; /* 2 digits for each component */ | |||
239 | #define READ_CAP_16_RESP_SIZE 32 | 239 | #define READ_CAP_16_RESP_SIZE 32 |
240 | 240 | ||
241 | /* NVMe Namespace and Command Defines */ | 241 | /* NVMe Namespace and Command Defines */ |
242 | #define NVME_GET_SMART_LOG_PAGE 0x02 | ||
243 | #define BYTES_TO_DWORDS 4 | 242 | #define BYTES_TO_DWORDS 4 |
244 | #define NVME_MAX_FIRMWARE_SLOT 7 | 243 | #define NVME_MAX_FIRMWARE_SLOT 7 |
245 | 244 | ||
@@ -1019,7 +1018,7 @@ static int nvme_trans_log_info_exceptions(struct nvme_ns *ns, | |||
1019 | c.common.nsid = cpu_to_le32(0xFFFFFFFF); | 1018 | c.common.nsid = cpu_to_le32(0xFFFFFFFF); |
1020 | c.common.prp1 = cpu_to_le64(dma_addr); | 1019 | c.common.prp1 = cpu_to_le64(dma_addr); |
1021 | c.common.cdw10[0] = cpu_to_le32((((sizeof(struct nvme_smart_log) / | 1020 | c.common.cdw10[0] = cpu_to_le32((((sizeof(struct nvme_smart_log) / |
1022 | BYTES_TO_DWORDS) - 1) << 16) | NVME_GET_SMART_LOG_PAGE); | 1021 | BYTES_TO_DWORDS) - 1) << 16) | NVME_LOG_SMART); |
1023 | res = nvme_submit_admin_cmd(dev, &c, NULL); | 1022 | res = nvme_submit_admin_cmd(dev, &c, NULL); |
1024 | if (res != NVME_SC_SUCCESS) { | 1023 | if (res != NVME_SC_SUCCESS) { |
1025 | temp_c = LOG_TEMP_UNKNOWN; | 1024 | temp_c = LOG_TEMP_UNKNOWN; |
@@ -1087,7 +1086,7 @@ static int nvme_trans_log_temperature(struct nvme_ns *ns, struct sg_io_hdr *hdr, | |||
1087 | c.common.nsid = cpu_to_le32(0xFFFFFFFF); | 1086 | c.common.nsid = cpu_to_le32(0xFFFFFFFF); |
1088 | c.common.prp1 = cpu_to_le64(dma_addr); | 1087 | c.common.prp1 = cpu_to_le64(dma_addr); |
1089 | c.common.cdw10[0] = cpu_to_le32((((sizeof(struct nvme_smart_log) / | 1088 | c.common.cdw10[0] = cpu_to_le32((((sizeof(struct nvme_smart_log) / |
1090 | BYTES_TO_DWORDS) - 1) << 16) | NVME_GET_SMART_LOG_PAGE); | 1089 | BYTES_TO_DWORDS) - 1) << 16) | NVME_LOG_SMART); |
1091 | res = nvme_submit_admin_cmd(dev, &c, NULL); | 1090 | res = nvme_submit_admin_cmd(dev, &c, NULL); |
1092 | if (res != NVME_SC_SUCCESS) { | 1091 | if (res != NVME_SC_SUCCESS) { |
1093 | temp_c_cur = LOG_TEMP_UNKNOWN; | 1092 | temp_c_cur = LOG_TEMP_UNKNOWN; |