From 9b347b668b9c95799debf20f351458974b1d9500 Mon Sep 17 00:00:00 2001 From: Tokunori Ikegami Date: Sat, 8 May 2021 02:14:14 +0900 Subject: [PATCH] =?utf8?q?nvme-print:=20Print=20degree=20celsius=20as=20?= =?utf8?q?=20=C2=B0C=20instead=20of=20C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- nvme-print.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nvme-print.c b/nvme-print.c index 5dee0f2f..e020c7d6 100644 --- a/nvme-print.c +++ b/nvme-print.c @@ -2853,14 +2853,14 @@ static void nvme_show_id_ctrl_apsta(__u8 apsta) static void nvme_show_id_ctrl_wctemp(__le16 wctemp) { - printf(" [15:0] : %ld C (%u Kelvin)\tWarning temperature (WCTEMP)\n", + printf(" [15:0] : %ld°C (%u Kelvin)\tWarning temperature (WCTEMP)\n", kelvin_to_celsius(le16_to_cpu(wctemp)), le16_to_cpu(wctemp)); printf("\n"); } static void nvme_show_id_ctrl_cctemp(__le16 cctemp) { - printf(" [15:0] : %ld C (%u Kelvin)\tCritical temperature (CCTEMP)\n", + printf(" [15:0] : %ld°C (%u Kelvin)\tCritical temperature (CCTEMP)\n", kelvin_to_celsius(le16_to_cpu(cctemp)), le16_to_cpu(cctemp)); printf("\n"); } @@ -4890,7 +4890,7 @@ void nvme_show_smart_log(struct nvme_smart_log *smart, unsigned int nsid, printf(" Persistent Mem. RO[5] : %d\n", (smart->critical_warning & 0x20) >> 5); } - printf("temperature : %ld C (%u Kelvin)\n", + printf("temperature : %ld°C (%u Kelvin)\n", kelvin_to_celsius(temperature), temperature); printf("available_spare : %u%%\n", smart->avail_spare); @@ -4929,8 +4929,8 @@ void nvme_show_smart_log(struct nvme_smart_log *smart, unsigned int nsid, if (temp == 0) continue; - printf("Temperature Sensor %d : %ld C (%u Kelvin)\n", - i + 1, kelvin_to_celsius(temp), temp); + printf("Temperature Sensor %d : %ld°C (%u Kelvin)\n", + i + 1, kelvin_to_celsius(temp), temp); } printf("Thermal Management T1 Trans Count : %u\n", le32_to_cpu(smart->thm_temp1_trans_count)); @@ -5534,9 +5534,9 @@ void nvme_feature_show_fields(enum nvme_features_id fid, unsigned int result, un printf("\tThreshold Type Select (THSEL): %u - %s\n", field, nvme_feature_temp_type_to_string(field)); field = (result & 0x000f0000) >> 16; - printf("\tThreshold Temperature Select (TMPSEL): %u - %s\n", field, - nvme_feature_temp_sel_to_string(field)); - printf("\tTemperature Threshold (TMPTH): %ld C (%u Kelvin)\n", + printf("\tThreshold Temperature Select (TMPSEL): %u - %s\n", + field, nvme_feature_temp_sel_to_string(field)); + printf("\tTemperature Threshold (TMPTH): %ld°C (%u Kelvin)\n", kelvin_to_celsius(result & 0x0000ffff), result & 0x0000ffff); break; case NVME_FEAT_FID_ERR_RECOVERY: @@ -5634,9 +5634,9 @@ void nvme_feature_show_fields(enum nvme_features_id fid, unsigned int result, un nvme_show_timestamp((struct nvme_timestamp *)buf); break; case NVME_FEAT_FID_HCTM: - printf("\tThermal Management Temperature 1 (TMT1) : %u Kelvin (%ld C)\n", + printf("\tThermal Management Temperature 1 (TMT1) : %u Kelvin (%ld°C)\n", result >> 16, kelvin_to_celsius(result >> 16)); - printf("\tThermal Management Temperature 2 (TMT2) : %u Kelvin (%ld C)\n", + printf("\tThermal Management Temperature 2 (TMT2) : %u Kelvin (%ld°C)\n", result & 0x0000ffff, kelvin_to_celsius(result & 0x0000ffff)); break; case NVME_FEAT_FID_KATO: -- 2.50.1