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

cpufreq: Use sizeof(*ptr) convetion for computing sizes 



Chapter 14 of Documentation/CodingStyle says:

The preferred form for passing a size of a struct is the following:

	p = kmalloc(sizeof(*p), ...);

The alternative form where struct name is spelled out hurts
readability and introduces an opportunity for a bug when the pointer
variable type is changed but the corresponding sizeof that is passed
to a memory allocator is not.

This wasn't followed consistently in drivers/cpufreq, let's make it
more consistent by always following this rule.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 3a3e9e06

drivers/cpufreq/acpi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		return blacklisted;

#endif



	data = kzalloc(sizeof(struct acpi_cpufreq_data), GFP_KERNEL);

	data = kzalloc(sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;
@@ -799,7 +799,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		goto err_unreg;

	}



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

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

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

	if (!data->freq_table) {

		result = -ENOMEM;

drivers/cpufreq/cpufreq.c

+4 −5
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static void cpufreq_init_policy(struct cpufreq_policy *policy) 
	struct cpufreq_policy new_policy;

	int ret = 0;



	memcpy(&new_policy, policy, sizeof(struct cpufreq_policy));

	memcpy(&new_policy, policy, sizeof(*policy));

	/* assure that the starting sequence is run in __cpufreq_set_policy */

	policy->governor = NULL;
@@ -1818,7 +1818,7 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu) 
	if (!cpu_policy)

		return -EINVAL;



	memcpy(policy, cpu_policy, sizeof(struct cpufreq_policy));

	memcpy(policy, cpu_policy, sizeof(*policy));



	cpufreq_cpu_put(cpu_policy);

	return 0;
@@ -1837,8 +1837,7 @@ static int __cpufreq_set_policy(struct cpufreq_policy *policy, 
	pr_debug("setting new policy for CPU %u: %u - %u kHz\n", new_policy->cpu,

		new_policy->min, new_policy->max);



	memcpy(&new_policy->cpuinfo, &policy->cpuinfo,

				sizeof(struct cpufreq_cpuinfo));

	memcpy(&new_policy->cpuinfo, &policy->cpuinfo, sizeof(policy->cpuinfo));



	if (new_policy->min > policy->max || new_policy->max < policy->min) {

		ret = -EINVAL;
@@ -1957,7 +1956,7 @@ int cpufreq_update_policy(unsigned int cpu) 
	}



	pr_debug("updating policy for CPU %u\n", cpu);

	memcpy(&new_policy, policy, sizeof(struct cpufreq_policy));

	memcpy(&new_policy, policy, sizeof(*policy));

	new_policy.min = policy->user_policy.min;

	new_policy.max = policy->user_policy.max;

	new_policy.policy = policy->user_policy.policy;

drivers/cpufreq/cpufreq_conservative.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int cs_init(struct dbs_data *dbs_data) 
{

	struct cs_dbs_tuners *tuners;



	tuners = kzalloc(sizeof(struct cs_dbs_tuners), GFP_KERNEL);

	tuners = kzalloc(sizeof(*tuners), GFP_KERNEL);

	if (!tuners) {

		pr_err("%s: kzalloc failed\n", __func__);

		return -ENOMEM;

drivers/cpufreq/cpufreq_ondemand.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static int od_init(struct dbs_data *dbs_data) 
	u64 idle_time;

	int cpu;



	tuners = kzalloc(sizeof(struct od_dbs_tuners), GFP_KERNEL);

	tuners = kzalloc(sizeof(*tuners), GFP_KERNEL);

	if (!tuners) {

		pr_err("%s: kzalloc failed\n", __func__);

		return -ENOMEM;

drivers/cpufreq/cpufreq_stats.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static int cpufreq_stats_create_table(struct cpufreq_policy *policy, 
	unsigned int cpu = policy->cpu;

	if (per_cpu(cpufreq_stats_table, cpu))

		return -EBUSY;

	stat = kzalloc(sizeof(struct cpufreq_stats), GFP_KERNEL);

	stat = kzalloc(sizeof(*stat), GFP_KERNEL);

	if ((stat) == NULL)

		return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE