File libndctl-msft-Remove-NDN_MSFT_SMART_-_VALID-def... of Package ndctl

Overview Repositories Revisions Requests Users Attributes Meta

File libndctl-msft-Remove-NDN_MSFT_SMART_-_VALID-defines.patch of Package ndctl

From 15e60801a4c8cd659b0a3b0c91d12c0c84e4ebf6 Mon Sep 17 00:00:00 2001
From: Alexander Motin <mav@ixsystems.com>
Date: Wed, 15 Feb 2023 11:49:28 -0500
Subject: [PATCH 3/6] libndctl/msft: Remove NDN_MSFT_SMART_*_VALID defines.

Upstream: v76
Git-commit: 15e60801a4c8cd659b0a3b0c91d12c0c84e4ebf6

The smart_get_flags() method returns set of globaly defined flags,
that don't need to be redefined for the specific NVDIMM family.
Replace the MSFT variants with ND_SMART_* ones.

Signed-off-by: Alexander Motin <mav@ixsystems.com>
Link: https://lore.kernel.org/r/20230215164930.707170-1-mav@ixsystems.com
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
 ndctl/lib/msft.c | 5 ++---
 ndctl/lib/msft.h | 5 -----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ndctl/lib/msft.c b/ndctl/lib/msft.c
index 3112799..22f72dd 100644
--- a/ndctl/lib/msft.c
+++ b/ndctl/lib/msft.c
@@ -80,9 +80,8 @@ static unsigned int msft_cmd_smart_get_flags(struct ndctl_cmd *cmd)
 	}
 
 	/* below health data can be retrieved via MSFT _DSM function 11 */
-	return NDN_MSFT_SMART_HEALTH_VALID |
-		NDN_MSFT_SMART_TEMP_VALID |
-		NDN_MSFT_SMART_USED_VALID;
+	return ND_SMART_HEALTH_VALID | ND_SMART_TEMP_VALID |
+	    ND_SMART_USED_VALID;
 }
 
 static unsigned int num_set_bit_health(__u16 num)
diff --git a/ndctl/lib/msft.h b/ndctl/lib/msft.h
index 978cc11..c462612 100644
--- a/ndctl/lib/msft.h
+++ b/ndctl/lib/msft.h
@@ -12,11 +12,6 @@ enum {
 	NDN_MSFT_CMD_SMART = 11,
 };
 
-/* NDN_MSFT_CMD_SMART */
-#define NDN_MSFT_SMART_HEALTH_VALID	ND_SMART_HEALTH_VALID
-#define NDN_MSFT_SMART_TEMP_VALID	ND_SMART_TEMP_VALID
-#define NDN_MSFT_SMART_USED_VALID	ND_SMART_USED_VALID
-
 /*
  * This is actually function 11 data,
  * This is the closest I can find to match smart
-- 
2.39.1

Places

File libndctl-msft-Remove-NDN_MSFT_SMART_-_VALID-defines.patch of Package ndctl

Places