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

Commit ea572f81 authored by Chanwoo Choi's avatar Chanwoo Choi Committed by MyungJoo Ham
Browse files

PM / devfreq: Change return type of devfreq_set_freq_table() 



This patch changes the return type of devfreq_set_freq_table()
from 'void' to 'int' in order to check whether it fails or not.

And This patch just removes the 'devfreq' prefix and the description
of function. Because the helper functions are only used by the devfreq.

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
parent f1d981ea

drivers/devfreq/devfreq.c

+9 −9
Original line number Diff line number Diff line
@@ -116,11 +116,7 @@ static int devfreq_get_freq_level(struct devfreq *devfreq, unsigned long freq) 
	return -EINVAL;

}



/**

 * devfreq_set_freq_table() - Initialize freq_table for the frequency

 * @devfreq:	the devfreq instance

 */

static void devfreq_set_freq_table(struct devfreq *devfreq)

static int set_freq_table(struct devfreq *devfreq)

{

	struct devfreq_dev_profile *profile = devfreq->profile;

	struct dev_pm_opp *opp;
@@ -130,7 +126,7 @@ static void devfreq_set_freq_table(struct devfreq *devfreq) 
	/* Initialize the freq_table from OPP table */

	count = dev_pm_opp_get_opp_count(devfreq->dev.parent);

	if (count <= 0)

		return;

		return -EINVAL;



	profile->max_state = count;

	profile->freq_table = devm_kcalloc(devfreq->dev.parent,
@@ -139,7 +135,7 @@ static void devfreq_set_freq_table(struct devfreq *devfreq) 
					GFP_KERNEL);

	if (!profile->freq_table) {

		profile->max_state = 0;

		return;

		return -ENOMEM;

	}



	for (i = 0, freq = 0; i < profile->max_state; i++, freq++) {
@@ -147,11 +143,13 @@ static void devfreq_set_freq_table(struct devfreq *devfreq) 
		if (IS_ERR(opp)) {

			devm_kfree(devfreq->dev.parent, profile->freq_table);

			profile->max_state = 0;

			return;

			return PTR_ERR(opp);

		}

		dev_pm_opp_put(opp);

		profile->freq_table[i] = freq;

	}



	return 0;

}



/**
@@ -601,7 +599,9 @@ struct devfreq *devfreq_add_device(struct device *dev, 


	if (!devfreq->profile->max_state && !devfreq->profile->freq_table) {

		mutex_unlock(&devfreq->lock);

		devfreq_set_freq_table(devfreq);

		err = set_freq_table(devfreq);

		if (err < 0)

			goto err_out;

		mutex_lock(&devfreq->lock);

	}