Merging upstream version 2.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 22 deletions

diff --git a/plugins/transcend/transcend-nvme.c b/plugins/transcend/transcend-nvme.c
index 024351f..547fbf4 100644
--- a/plugins/transcend/transcend-nvme.c
+++ b/plugins/transcend/transcend-nvme.c
@@ -21,7 +21,7 @@ static int getHealthValue(int argc, char **argv, struct command *cmd, struct plu
 {
 	struct nvme_smart_log smart_log;
 	char *desc = "Get nvme health percentage.";
-	int  percent_used = 0, healthvalue=0;
+	int  percent_used = 0, healthvalue = 0;
 	struct nvme_dev *dev;
 	int result;
 
@@ -31,59 +31,55 @@ static int getHealthValue(int argc, char **argv, struct command *cmd, struct plu
 
 	result = parse_and_open(&dev, argc, argv, desc, opts);
 	if (result) {
-		printf("\nDevice not found \n");;
+		printf("\nDevice not found\n");
 		return -1;
 	}
 	result = nvme_get_log_smart(dev_fd(dev), 0xffffffff, false, &smart_log);
 	if (!result) {
 		printf("Transcend NVME heath value: ");
-		percent_used =smart_log.percent_used;
-		
-		if(percent_used>100 || percent_used<0)
-		{
+		percent_used = smart_log.percent_used;
+
+		if (percent_used > 100 || percent_used < 0) {
 			printf("0%%\n");
-		}
-		else
-		{
+		} else {
 			healthvalue = 100 - percent_used;
-			printf("%d%%\n",healthvalue);
+			printf("%d%%\n", healthvalue);
 		}
-			 
 	}
 	dev_close(dev);
 	return result;
 }
 
- 
 static int getBadblock(int argc, char **argv, struct command *cmd, struct plugin *plugin)
 {
 
 	char *desc = "Get nvme bad block number.";
 	struct nvme_dev *dev;
 	int result;
- 
+
 	OPT_ARGS(opts) = {
-		 
 		OPT_END()
 	};
 
 	result = parse_and_open(&dev, argc, argv, desc, opts);
 	if (result) {
-		printf("\nDevice not found \n");;
+		printf("\nDevice not found\n");
 		return -1;
 	}
-	unsigned char data[1]={0};
+	unsigned char data[1] = {0};
 	struct nvme_passthru_cmd nvmecmd;
-	memset(&nvmecmd,0,sizeof(nvmecmd));
-	nvmecmd.opcode=OP_BAD_BLOCK;
-	nvmecmd.cdw10=DW10_BAD_BLOCK;
-	nvmecmd.cdw12=DW12_BAD_BLOCK;
+
+	memset(&nvmecmd, 0, sizeof(nvmecmd));
+	nvmecmd.opcode = OP_BAD_BLOCK;
+	nvmecmd.cdw10 = DW10_BAD_BLOCK;
+	nvmecmd.cdw12 = DW12_BAD_BLOCK;
 	nvmecmd.addr = (__u64)(uintptr_t)data;
 	nvmecmd.data_len = 0x1;
 	result = nvme_submit_admin_passthru(dev_fd(dev), &nvmecmd, NULL);
-	if(!result) {
+	if (!result) {
 		int badblock  = data[0];
-		printf("Transcend NVME badblock count: %d\n",badblock);
+
+		printf("Transcend NVME badblock count: %d\n", badblock);
 	}
 	dev_close(dev);
 	return result;