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

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

cpufreq: Fix minor formatting issues 



There were a few noticeable formatting issues in core cpufreq code.
This cleans them up to make code look better.  The changes include:
 - Whitespace cleanup.
 - Rearrangements of code.
 - Multiline comments fixes.
 - Formatting changes to fit 80 columns.

Copyright information in cpufreq.c is also updated to include my name
for 2013.

[rjw: Changelog]
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 95731ebb

drivers/cpufreq/cpufreq.c

+27 −36
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 *

 *  Copyright (C) 2001 Russell King

 *            (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>

 *            (C) 2013 Viresh Kumar <viresh.kumar@linaro.org>

 *

 *  Oct 2005 - Ashok Raj <ashok.raj@intel.com>

 *	Added handling for CPU hotplug
@@ -12,7 +13,6 @@ 
 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -44,12 +44,13 @@ 
 */

static struct cpufreq_driver *cpufreq_driver;

static DEFINE_PER_CPU(struct cpufreq_policy *, cpufreq_cpu_data);

static DEFINE_RWLOCK(cpufreq_driver_lock);

static DEFINE_MUTEX(cpufreq_governor_lock);



#ifdef CONFIG_HOTPLUG_CPU

/* This one keeps track of the previously set governor of a removed CPU */

static DEFINE_PER_CPU(char[CPUFREQ_NAME_LEN], cpufreq_cpu_governor);

#endif

static DEFINE_RWLOCK(cpufreq_driver_lock);

static DEFINE_MUTEX(cpufreq_governor_lock);



/*

 * cpu_policy_rwsem is a per CPU reader-writer semaphore designed to cure
@@ -199,7 +200,6 @@ static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs) 
	if (!try_module_get(cpufreq_driver->owner))

		goto err_out_unlock;





	/* get the CPU */

	data = per_cpu(cpufreq_cpu_data, cpu);
@@ -297,7 +297,6 @@ static inline void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci) 
}

#endif





void __cpufreq_notify_transition(struct cpufreq_policy *policy,

		struct cpufreq_freqs *freqs, unsigned int state)

{
@@ -343,6 +342,7 @@ void __cpufreq_notify_transition(struct cpufreq_policy *policy, 
		break;

	}

}



/**

 * cpufreq_notify_transition - call notifier chain and adjust_jiffies

 * on frequency transition.
@@ -360,7 +360,6 @@ void cpufreq_notify_transition(struct cpufreq_policy *policy, 
EXPORT_SYMBOL_GPL(cpufreq_notify_transition);







/*********************************************************************

 *                          SYSFS INTERFACE                          *

 *********************************************************************/
@@ -425,7 +424,6 @@ out: 
	return err;

}





/**

 * cpufreq_per_cpu_attr_read() / show_##file_name() -

 * print out cpufreq information
@@ -490,7 +488,6 @@ static ssize_t show_cpuinfo_cur_freq(struct cpufreq_policy *policy, 
	return sprintf(buf, "%u\n", cur_freq);

}





/**

 * show_scaling_governor - show the current policy for the specified CPU

 */
@@ -506,7 +503,6 @@ static ssize_t show_scaling_governor(struct cpufreq_policy *policy, char *buf) 
	return -EINVAL;

}





/**

 * store_scaling_governor - store policy for the specified CPU

 */
@@ -529,8 +525,10 @@ static ssize_t store_scaling_governor(struct cpufreq_policy *policy, 
						&new_policy.governor))

		return -EINVAL;



	/* Do not use cpufreq_set_policy here or the user_policy.max

	   will be wrongly overridden */

	/*

	 * Do not use cpufreq_set_policy here or the user_policy.max

	 * will be wrongly overridden

	 */

	ret = __cpufreq_set_policy(policy, &new_policy);



	policy->user_policy.policy = policy->policy;
@@ -1094,7 +1092,8 @@ static void update_policy_cpu(struct cpufreq_policy *policy, unsigned int cpu) 
 * Caller should already have policy_rwsem in write mode for this CPU.

 * This routine frees the rwsem before returning.

 */

static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)

static int __cpufreq_remove_dev(struct device *dev,

		struct subsys_interface *sif)

{

	unsigned int cpu = dev->id, ret, cpus;

	unsigned long flags;
@@ -1201,7 +1200,6 @@ static int __cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif 
	return 0;

}





static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)

{

	unsigned int cpu = dev->id;
@@ -1214,7 +1212,6 @@ static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif) 
	return retval;

}





static void handle_update(struct work_struct *work)

{

	struct cpufreq_policy *policy =
@@ -1225,7 +1222,8 @@ static void handle_update(struct work_struct *work) 
}



/**

 *	cpufreq_out_of_sync - If actual and saved CPU frequency differs, we're in deep trouble.

 *	cpufreq_out_of_sync - If actual and saved CPU frequency differs, we're

 *	in deep trouble.

 *	@cpu: cpu number

 *	@old_freq: CPU frequency the kernel thinks the CPU runs at

 *	@new_freq: CPU frequency the CPU actually runs at
@@ -1240,7 +1238,6 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq, 
	struct cpufreq_freqs freqs;

	unsigned long flags;





	pr_debug("Warning: CPU frequency out of sync: cpufreq and timing "

	       "core thinks of %u, is %u kHz.\n", old_freq, new_freq);
@@ -1255,7 +1252,6 @@ static void cpufreq_out_of_sync(unsigned int cpu, unsigned int old_freq, 
	cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);

}





/**

 * cpufreq_quick_get - get the CPU frequency (in kHz) from policy->cur

 * @cpu: CPU number
@@ -1301,7 +1297,6 @@ unsigned int cpufreq_quick_get_max(unsigned int cpu) 
}

EXPORT_SYMBOL(cpufreq_quick_get_max);





static unsigned int __cpufreq_get(unsigned int cpu)

{

	struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
@@ -1360,7 +1355,6 @@ static struct subsys_interface cpufreq_interface = { 
	.remove_dev	= cpufreq_remove_dev,

};





/**

 * cpufreq_bp_suspend - Prepare the boot CPU for system suspend.

 *
@@ -1497,7 +1491,6 @@ int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list) 
}

EXPORT_SYMBOL(cpufreq_register_notifier);





/**

 *	cpufreq_unregister_notifier - unregister a driver with cpufreq

 *	@nb: notifier block to be unregistered
@@ -1537,7 +1530,6 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier); 
 *                              GOVERNORS                            *

 *********************************************************************/





int __cpufreq_driver_target(struct cpufreq_policy *policy,

			    unsigned int target_freq,

			    unsigned int relation)
@@ -1678,7 +1670,6 @@ static int __cpufreq_governor(struct cpufreq_policy *policy, 
	return ret;

}





int cpufreq_register_governor(struct cpufreq_governor *governor)

{

	int err;
@@ -1703,7 +1694,6 @@ int cpufreq_register_governor(struct cpufreq_governor *governor) 
}

EXPORT_SYMBOL_GPL(cpufreq_register_governor);





void cpufreq_unregister_governor(struct cpufreq_governor *governor)

{

#ifdef CONFIG_HOTPLUG_CPU
@@ -1733,7 +1723,6 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor) 
EXPORT_SYMBOL_GPL(cpufreq_unregister_governor);







/*********************************************************************

 *                          POLICY INTERFACE                         *

 *********************************************************************/
@@ -1762,7 +1751,6 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu) 
}

EXPORT_SYMBOL(cpufreq_get_policy);





/*

 * data   : current policy.

 * policy : policy to be set.
@@ -1796,8 +1784,10 @@ static int __cpufreq_set_policy(struct cpufreq_policy *data, 
	blocking_notifier_call_chain(&cpufreq_policy_notifier_list,

			CPUFREQ_INCOMPATIBLE, policy);



	/* verify the cpu speed can be set within this limit,

	   which might be different to the first one */

	/*

	 * verify the cpu speed can be set within this limit, which might be

	 * different to the first one

	 */

	ret = cpufreq_driver->verify(policy);

	if (ret)

		goto error_out;
@@ -1899,8 +1889,10 @@ int cpufreq_update_policy(unsigned int cpu) 
	policy.policy = data->user_policy.policy;

	policy.governor = data->user_policy.governor;



	/* BIOS might change freq behind our back

	  -> ask driver for current freq and notify governors about a change */

	/*

	 * BIOS might change freq behind our back

	 * -> ask driver for current freq and notify governors about a change

	 */

	if (cpufreq_driver->get) {

		policy.cur = cpufreq_driver->get(cpu);

		if (!data->cur) {
@@ -2028,7 +2020,6 @@ err_null_driver: 
}

EXPORT_SYMBOL_GPL(cpufreq_register_driver);





/**

 * cpufreq_unregister_driver - unregister the current CPUFreq driver

 *

drivers/cpufreq/cpufreq_performance.c

+0 −4
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/cpufreq.h>

#include <linux/init.h>





static int cpufreq_governor_performance(struct cpufreq_policy *policy,

					unsigned int event)

{
@@ -44,19 +43,16 @@ struct cpufreq_governor cpufreq_gov_performance = { 
	.owner		= THIS_MODULE,

};





static int __init cpufreq_gov_performance_init(void)

{

	return cpufreq_register_governor(&cpufreq_gov_performance);

}





static void __exit cpufreq_gov_performance_exit(void)

{

	cpufreq_unregister_governor(&cpufreq_gov_performance);

}





MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>");

MODULE_DESCRIPTION("CPUfreq policy governor 'performance'");

MODULE_LICENSE("GPL");

drivers/cpufreq/cpufreq_powersave.c

+2 −4
Original line number Diff line number Diff line
@@ -48,13 +48,11 @@ static int __init cpufreq_gov_powersave_init(void) 
	return cpufreq_register_governor(&cpufreq_gov_powersave);

}





static void __exit cpufreq_gov_powersave_exit(void)

{

	cpufreq_unregister_governor(&cpufreq_gov_powersave);

}





MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>");

MODULE_DESCRIPTION("CPUfreq policy governor 'powersave'");

MODULE_LICENSE("GPL");

drivers/cpufreq/cpufreq_userspace.c

+0 −4
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ static int cpufreq_set(struct cpufreq_policy *policy, unsigned int freq) 
	return ret;

}





static ssize_t show_speed(struct cpufreq_policy *policy, char *buf)

{

	return sprintf(buf, "%u\n", policy->cur);
@@ -101,7 +100,6 @@ static int cpufreq_governor_userspace(struct cpufreq_policy *policy, 
	return rc;

}





#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE

static

#endif
@@ -118,13 +116,11 @@ static int __init cpufreq_gov_userspace_init(void) 
	return cpufreq_register_governor(&cpufreq_gov_userspace);

}





static void __exit cpufreq_gov_userspace_exit(void)

{

	cpufreq_unregister_governor(&cpufreq_gov_userspace);

}





MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>, "

		"Russell King <rmk@arm.linux.org.uk>");

MODULE_DESCRIPTION("CPUfreq policy governor 'userspace'");

include/linux/cpufreq.h

+20 −21
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
/* Print length for names. Extra 1 space for accomodating '\n' in prints */

#define CPUFREQ_NAME_PLEN (CPUFREQ_NAME_LEN + 1)





/*********************************************************************

 *                     CPUFREQ NOTIFIER INTERFACE                    *

 *********************************************************************/
@@ -153,9 +152,9 @@ struct cpufreq_freqs { 
	u8 flags;		/* flags of cpufreq_driver, see below. */

};





/**

 * cpufreq_scale - "old * mult / div" calculation for large values (32-bit-arch safe)

 * cpufreq_scale - "old * mult / div" calculation for large values (32-bit-arch

 * safe)

 * @old:   old value

 * @div:   divisor

 * @mult:  multiplier
@@ -163,7 +162,8 @@ struct cpufreq_freqs { 
 *

 * new = old * mult / div

 */

static inline unsigned long cpufreq_scale(unsigned long old, u_int div, u_int mult)

static inline unsigned long cpufreq_scale(unsigned long old, u_int div,

		u_int mult)

{

#if BITS_PER_LONG == 32
@@ -216,14 +216,12 @@ extern int __cpufreq_driver_target(struct cpufreq_policy *policy, 
				   unsigned int target_freq,

				   unsigned int relation);





extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy,

				   unsigned int cpu);



int cpufreq_register_governor(struct cpufreq_governor *governor);

void cpufreq_unregister_governor(struct cpufreq_governor *governor);





/*********************************************************************

 *                      CPUFREQ DRIVER INTERFACE                     *

 *********************************************************************/
@@ -282,11 +280,11 @@ struct cpufreq_driver { 
int cpufreq_register_driver(struct cpufreq_driver *driver_data);

int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);





void cpufreq_notify_transition(struct cpufreq_policy *policy,

		struct cpufreq_freqs *freqs, unsigned int state);



static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy, unsigned int min, unsigned int max)

static inline void cpufreq_verify_within_limits(struct cpufreq_policy *policy,

		unsigned int min, unsigned int max)

{

	if (policy->min < min)

		policy->min = min;
@@ -349,7 +347,9 @@ bool have_governor_per_policy(void); 
struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy);



#ifdef CONFIG_CPU_FREQ

/* query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it */

/*

 * query the current CPU frequency (in kHz). If zero, cpufreq couldn't detect it

 */

unsigned int cpufreq_get(unsigned int cpu);

#else

static inline unsigned int cpufreq_get(unsigned int cpu)
@@ -358,7 +358,9 @@ static inline unsigned int cpufreq_get(unsigned int cpu) 
}

#endif



/* query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it */

/*

 * query the last known CPU freq (in kHz). If zero, cpufreq couldn't detect it

 */

#ifdef CONFIG_CPU_FREQ

unsigned int cpufreq_quick_get(unsigned int cpu);

unsigned int cpufreq_quick_get_max(unsigned int cpu);
@@ -373,15 +375,13 @@ static inline unsigned int cpufreq_quick_get_max(unsigned int cpu) 
}

#endif





/*********************************************************************

 *                       CPUFREQ DEFAULT GOVERNOR                    *

 *********************************************************************/





/*

  Performance governor is fallback governor if any other gov failed to

  auto load due latency restrictions

 * Performance governor is fallback governor if any other gov failed to auto

 * load due latency restrictions

 */

#ifdef CONFIG_CPU_FREQ_GOV_PERFORMANCE

extern struct cpufreq_governor cpufreq_gov_performance;
@@ -402,7 +402,6 @@ extern struct cpufreq_governor cpufreq_gov_conservative; 
#define CPUFREQ_DEFAULT_GOVERNOR	(&cpufreq_gov_conservative)

#endif





/*********************************************************************

 *                     FREQUENCY TABLE HELPERS                       *

 *********************************************************************/

drivers/cpufreq/cpufreq_governor.h

+2 −2

File changed.

Contains only whitespace changes.

drivers/cpufreq/cpufreq_stats.c

+2 −2

File changed.

Contains only whitespace changes.