[065/166] drivers/base/memory: store mapping between MMOP_* and string in an array

Commit Message

Andrew Morton April 7, 2020, 3:07 a.m. UTC

From: David Hildenbrand <[e-mail]>
Subject: drivers/base/memory: store mapping between MMOP_* and string in an array

Let's use a simple array which we can reuse soon.  While at it, move the
string->mmop conversion out of the device hotplug lock.

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: David Hildenbrand <[e-mail]>
Reviewed-by: Wei Yang <[e-mail]>
Acked-by: Michal Hocko <[e-mail]>
Reviewed-by: Baoquan He <[e-mail]>
Acked-by: Pankaj Gupta <[e-mail]>
Cc: Greg Kroah-Hartman <[e-mail]>
Cc: Oscar Salvador <[e-mail]>
Cc: "Rafael J. Wysocki" <[e-mail]>
Cc: Wei Yang <[e-mail]>
Cc: Benjamin Herrenschmidt <[e-mail]>
Cc: Eduardo Habkost <[e-mail]>
Cc: Haiyang Zhang <[e-mail]>
Cc: Igor Mammedov <[e-mail]>
Cc: "K. Y. Srinivasan" <[e-mail]>
Cc: Michael Ellerman <[e-mail]>
Cc: Paul Mackerras <[e-mail]>
Cc: Stephen Hemminger <[e-mail]>
Cc: Vitaly Kuznetsov <[e-mail]>
Cc: Wei Liu <[e-mail]>
Cc: Yumei Huang <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 drivers/base/memory.c |   38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

Patch

--- a/drivers/base/memory.c~drivers-base-memory-store-mapping-between-mmop_-and-string-in-an-array
+++ a/drivers/base/memory.c
@@ -27,6 +27,24 @@ 
 
 #define MEMORY_CLASS_NAME	"memory"
 
+static const char *const online_type_to_str[] = {
+	[MMOP_OFFLINE] = "offline",
+	[MMOP_ONLINE] = "online",
+	[MMOP_ONLINE_KERNEL] = "online_kernel",
+	[MMOP_ONLINE_MOVABLE] = "online_movable",
+};
+
+static int memhp_online_type_from_str(const char *str)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(online_type_to_str); i++) {
+		if (sysfs_streq(str, online_type_to_str[i]))
+			return i;
+	}
+	return -EINVAL;
+}
+
 #define to_memory_block(dev) container_of(dev, struct memory_block, dev)
 
 static int sections_per_block;
@@ -228,26 +246,17 @@  static int memory_subsys_offline(struct
 static ssize_t state_store(struct device *dev, struct device_attribute *attr,
 			   const char *buf, size_t count)
 {
+	const int online_type = memhp_online_type_from_str(buf);
 	struct memory_block *mem = to_memory_block(dev);
-	int ret, online_type;
+	int ret;
+
+	if (online_type < 0)
+		return -EINVAL;
 
 	ret = lock_device_hotplug_sysfs();
 	if (ret)
 		return ret;
 
-	if (sysfs_streq(buf, "online_kernel"))
-		online_type = MMOP_ONLINE_KERNEL;
-	else if (sysfs_streq(buf, "online_movable"))
-		online_type = MMOP_ONLINE_MOVABLE;
-	else if (sysfs_streq(buf, "online"))
-		online_type = MMOP_ONLINE;
-	else if (sysfs_streq(buf, "offline"))
-		online_type = MMOP_OFFLINE;
-	else {
-		ret = -EINVAL;
-		goto err;
-	}
-
 	switch (online_type) {
 	case MMOP_ONLINE_KERNEL:
 	case MMOP_ONLINE_MOVABLE:
@@ -263,7 +272,6 @@  static ssize_t state_store(struct device
 		ret = -EINVAL; /* should never happen */
 	}
 
-err:
 	unlock_device_hotplug();
 
 	if (ret < 0)