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

Commit 71508a1f authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: use kzalloc() to allocate memory for cpufreq_frequency_table 



Few drivers are using kmalloc() to allocate memory for frequency
tables and since we will have an additional field '.flags' in
'struct cpufreq_frequency_table', these might become unstable.
Better get these fixed by replacing kmalloc() by kzalloc() instead.

Along with that we also remove use of .driver_data from SPEAr driver
as it doesn't use it at all. Also, writing zero to .driver_data is not
required for powernow-k8 as it is already zero.

Reported-and-reviewed-by: default avatarGautham R. Shenoy <ego@linux.vnet.ibm.com>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ae87f10f

drivers/cpufreq/acpi-cpufreq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -754,7 +754,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		goto err_unreg;

		goto err_unreg;

	}

	}





	data->freq_table = kmalloc(sizeof(*data->freq_table) *

	data->freq_table = kzalloc(sizeof(*data->freq_table) *

		    (perf->state_count+1), GFP_KERNEL);

		    (perf->state_count+1), GFP_KERNEL);

	if (!data->freq_table) {

	if (!data->freq_table) {

		result = -ENOMEM;

		result = -ENOMEM;

drivers/cpufreq/ia64-acpi-cpufreq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -254,7 +254,7 @@ acpi_cpufreq_cpu_init ( 
	}

	}





	/* alloc freq_table */

	/* alloc freq_table */

	data->freq_table = kmalloc(sizeof(*data->freq_table) *

	data->freq_table = kzalloc(sizeof(*data->freq_table) *

	                           (data->acpi_data.state_count + 1),

	                           (data->acpi_data.state_count + 1),

	                           GFP_KERNEL);

	                           GFP_KERNEL);

	if (!data->freq_table) {

	if (!data->freq_table) {

drivers/cpufreq/longhaul.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -475,7 +475,7 @@ static int longhaul_get_ranges(void) 
		return -EINVAL;

		return -EINVAL;

	}

	}





	longhaul_table = kmalloc((numscales + 1) * sizeof(*longhaul_table),

	longhaul_table = kzalloc((numscales + 1) * sizeof(*longhaul_table),

			GFP_KERNEL);

			GFP_KERNEL);

	if (!longhaul_table)

	if (!longhaul_table)

		return -ENOMEM;

		return -ENOMEM;

drivers/cpufreq/powernow-k8.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -623,7 +623,7 @@ static int fill_powernow_table(struct powernow_k8_data *data, 
	if (check_pst_table(data, pst, maxvid))

	if (check_pst_table(data, pst, maxvid))

		return -EINVAL;

		return -EINVAL;





	powernow_table = kmalloc((sizeof(*powernow_table)

	powernow_table = kzalloc((sizeof(*powernow_table)

		* (data->numps + 1)), GFP_KERNEL);

		* (data->numps + 1)), GFP_KERNEL);

	if (!powernow_table) {

	if (!powernow_table) {

		printk(KERN_ERR PFX "powernow_table memory alloc failure\n");

		printk(KERN_ERR PFX "powernow_table memory alloc failure\n");
@@ -793,7 +793,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) 
	}

	}





	/* fill in data->powernow_table */

	/* fill in data->powernow_table */

	powernow_table = kmalloc((sizeof(*powernow_table)

	powernow_table = kzalloc((sizeof(*powernow_table)

		* (data->acpi_data.state_count + 1)), GFP_KERNEL);

		* (data->acpi_data.state_count + 1)), GFP_KERNEL);

	if (!powernow_table) {

	if (!powernow_table) {

		pr_debug("powernow_table memory alloc failure\n");

		pr_debug("powernow_table memory alloc failure\n");
@@ -810,7 +810,6 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) 




	powernow_table[data->acpi_data.state_count].frequency =

	powernow_table[data->acpi_data.state_count].frequency =

		CPUFREQ_TABLE_END;

		CPUFREQ_TABLE_END;

	powernow_table[data->acpi_data.state_count].driver_data = 0;

	data->powernow_table = powernow_table;

	data->powernow_table = powernow_table;





	if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)

	if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)

drivers/cpufreq/s3c24xx-cpufreq.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -586,7 +586,7 @@ static int s3c_cpufreq_build_freq(void) 
	size = cpu_cur.info->calc_freqtable(&cpu_cur, NULL, 0);

	size = cpu_cur.info->calc_freqtable(&cpu_cur, NULL, 0);

	size++;

	size++;





	ftab = kmalloc(sizeof(*ftab) * size, GFP_KERNEL);

	ftab = kzalloc(sizeof(*ftab) * size, GFP_KERNEL);

	if (!ftab) {

	if (!ftab) {

		printk(KERN_ERR "%s: no memory for tables\n", __func__);

		printk(KERN_ERR "%s: no memory for tables\n", __func__);

		return -ENOMEM;

		return -ENOMEM;
@@ -664,7 +664,7 @@ int __init s3c_plltab_register(struct cpufreq_frequency_table *plls, 




	size = sizeof(*vals) * (plls_no + 1);

	size = sizeof(*vals) * (plls_no + 1);





	vals = kmalloc(size, GFP_KERNEL);

	vals = kzalloc(size, GFP_KERNEL);

	if (vals) {

	if (vals) {

		memcpy(vals, plls, size);

		memcpy(vals, plls, size);

		pll_reg = vals;

		pll_reg = vals;