drivers/gpio/gpio-sim.c | 56 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c
index 271db3639a78..ac8416cd96c3 100644
--- a/drivers/gpio/gpio-sim.c
+++ b/drivers/gpio/gpio-sim.c
@@ -685,13 +685,36 @@ gpio_sim_device_config_live_show(struct config_item *item, char *page)
 	return sprintf(page, "%c\n", live ? '1' : '0');
 }
 
-static char **gpio_sim_make_line_names(struct gpio_sim_bank *bank,
-				       unsigned int *line_names_size)
+struct line_names {
+	unsigned int size;
+	char **lines;
+};
+
+static struct line_names make_line_names(unsigned int size)
+{
+	char **lines = kcalloc(size, sizeof(*lines), GFP_KERNEL);
+	if (!lines)
+		return (struct line_names) { 0, ERR_PTR(-ENOMEM) };
+
+	return (struct line_names) { size, lines };
+}
+
+static void free_line_names(struct line_names names)
+{
+	if (!IS_ERR_OR_NULL(names.lines))
+		kfree(names.lines);
+}
+
+DEFINE_CLASS(line_names,
+	struct line_names,
+	free_line_names(_T),
+	make_line_names(size), unsigned int size)
+
+static struct line_names gpio_sim_make_line_names(struct gpio_sim_bank *bank)
 {
 	unsigned int max_offset = 0;
 	bool has_line_names = false;
 	struct gpio_sim_line *line;
-	char **line_names;
 
 	list_for_each_entry(line, &bank->line_list, siblings) {
 		if (line->offset >= bank->num_lines)
@@ -714,23 +737,21 @@ static char **gpio_sim_make_line_names(struct gpio_sim_bank *bank,
 		 * This is not an error - NULL means, there are no line
 		 * names configured.
 		 */
-		return NULL;
+		return (struct line_names) { 0, NULL };
 
-	*line_names_size = max_offset + 1;
-
-	line_names = kcalloc(*line_names_size, sizeof(*line_names), GFP_KERNEL);
-	if (!line_names)
-		return ERR_PTR(-ENOMEM);
+	CLASS(line_names, names)(max_offset + 1);
+	if (IS_ERR(names.lines))
+		return names;
 
 	list_for_each_entry(line, &bank->line_list, siblings) {
 		if (line->offset >= bank->num_lines)
 			continue;
 
 		if (line->name && (line->offset <= max_offset))
-			line_names[line->offset] = line->name;
+			names.lines[line->offset] = line->name;
 	}
 
-	return line_names;
+	return (struct line_names) { names.size, no_free_ptr(names.lines) };
 }
 
 static void gpio_sim_remove_hogs(struct gpio_sim_device *dev)
@@ -834,8 +855,7 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank,
 			  struct fwnode_handle *parent)
 {
 	struct property_entry properties[GPIO_SIM_PROP_MAX];
-	unsigned int prop_idx = 0, line_names_size = 0;
-	char **line_names __free(kfree) = NULL;
+	unsigned int prop_idx = 0;
 
 	memset(properties, 0, sizeof(properties));
 
@@ -845,14 +865,14 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank,
 		properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label",
 							       bank->label);
 
-	line_names = gpio_sim_make_line_names(bank, &line_names_size);
-	if (IS_ERR(line_names))
-		return ERR_CAST(line_names);
+	class_line_names_t names __cleanup(class_line_names_destructor) = gpio_sim_make_line_names(bank);
+	if (IS_ERR(names.lines))
+		return ERR_CAST(names.lines);
 
-	if (line_names)
+	if (names.size)
 		properties[prop_idx++] = PROPERTY_ENTRY_STRING_ARRAY_LEN(
 						"gpio-line-names",
-						line_names, line_names_size);
+						names.lines, names.size);
 
 	return fwnode_create_software_node(properties, parent);
 }