Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b1953ed authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "lpm-levels: Remove kfree for memory allocated with devm_kzalloc"

parents 5aa1406e 5acbfff6

drivers/cpuidle/lpm-levels-of.c

+1 −32
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -423,10 +423,6 @@ static int parse_legacy_cluster_params(struct device_node *node, 
	return 0;

failed:

	pr_err("%s(): Failed reading %s\n", __func__, key);

	kfree(c->name);

	kfree(c->lpm_dev);

	c->name = NULL;

	c->lpm_dev = NULL;

	return ret;

}
@@ -612,8 +608,6 @@ static int parse_cluster_level(struct device_node *node, 
	return 0;

failed:

	pr_err("Failed %s() key = %s ret = %d\n", __func__, key, ret);

	kfree(level->mode);

	level->mode = NULL;

	return ret;

}
@@ -808,19 +802,12 @@ static int parse_cpu_levels(struct device_node *node, struct lpm_cluster *c) 


	return 0;

failed:

	for (i = 0; i < c->cpu->nlevels; i++) {

		kfree(c->cpu->levels[i].name);

		c->cpu->levels[i].name = NULL;

	}

	kfree(c->cpu);

	c->cpu = NULL;

	pr_err("%s(): Failed with error code:%d\n", __func__, ret);

	return ret;

}



void free_cluster_node(struct lpm_cluster *cluster)

{

	int i;

	struct lpm_cluster *cl, *m;



	list_for_each_entry_safe(cl, m, &cluster->child, list) {
@@ -828,22 +815,6 @@ void free_cluster_node(struct lpm_cluster *cluster) 
		free_cluster_node(cl);

	};



	if (cluster->cpu) {

		for (i = 0; i < cluster->cpu->nlevels; i++) {

			kfree(cluster->cpu->levels[i].name);

			cluster->cpu->levels[i].name = NULL;

		}

	}

	for (i = 0; i < cluster->nlevels; i++) {

		kfree(cluster->levels[i].mode);

		cluster->levels[i].mode = NULL;

	}

	kfree(cluster->cpu);

	kfree(cluster->name);

	kfree(cluster->lpm_dev);

	cluster->cpu = NULL;

	cluster->name = NULL;

	cluster->lpm_dev = NULL;

	cluster->ndevices = 0;

}
@@ -957,9 +928,7 @@ failed_parse_cluster: 
		list_del(&c->list);

	free_cluster_node(c);

failed_parse_params:

	c->parent = NULL;

	pr_err("Failed parse params\n");

	kfree(c);

	return NULL;

}

struct lpm_cluster *lpm_of_parse_cluster(struct platform_device *pdev)