From: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
To: pdeschrijver@nvidia.com
Cc: rmk+kernel@arm.linux.org.uk, swarren@nvidia.com,
linux-kernel@vger.kernel.org,
Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
Subject: [PATCH] init: calibrate: fix style issues
Date: Sat, 11 Oct 2014 18:31:15 +0200 [thread overview]
Message-ID: <1413045075-10416-1-git-send-email-rasmuswriedtlarsen@gmail.com> (raw)
* fix multiple quoted string split across lines style issues
* change printk(KERN_NOTICE to pr_notice
* insert spaces after , in function call
Signed-off-by: Rasmus Wriedt Larsen <rasmuswriedtlarsen@gmail.com>
---
init/calibrate.c | 34 +++++++++++++---------------------
1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/init/calibrate.c b/init/calibrate.c
index ce635dc..3cfd911 100644
--- a/init/calibrate.c
+++ b/init/calibrate.c
@@ -15,7 +15,7 @@ unsigned long lpj_fine;
unsigned long preset_lpj;
static int __init lpj_setup(char *str)
{
- preset_lpj = simple_strtoul(str,NULL,0);
+ preset_lpj = simple_strtoul(str, NULL, 0);
return 1;
}
@@ -40,11 +40,13 @@ static unsigned long calibrate_delay_direct(void)
unsigned long good_timer_sum = 0;
unsigned long good_timer_count = 0;
unsigned long measured_times[MAX_DIRECT_CALIBRATION_RETRIES];
- int max = -1; /* index of measured_times with max/min values or not set */
+
+ /* index of measured_times with max/min values or not set */
+ int max = -1;
int min = -1;
int i;
- if (read_current_timer(&pre_start) < 0 )
+ if (read_current_timer(&pre_start) < 0)
return 0;
/*
@@ -95,9 +97,7 @@ static unsigned long calibrate_delay_direct(void)
* >= 12.5% apart, redo calibration.
*/
if (start >= post_end)
- printk(KERN_NOTICE "calibrate_delay_direct() ignoring "
- "timer_rate as we had a TSC wrap around"
- " start=%lu >=post_end=%lu\n",
+ pr_notice("calibrate_delay_direct() ignoring timer_rate as we had a TSC wrap around start=%lu >=post_end=%lu\n",
start, post_end);
if (start < post_end && pre_start != 0 && pre_end != 0 &&
(timer_rate_max - timer_rate_min) < (timer_rate_max >> 3)) {
@@ -134,14 +134,12 @@ static unsigned long calibrate_delay_direct(void)
good_timer_count = 0;
if ((measured_times[max] - estimate) <
(estimate - measured_times[min])) {
- printk(KERN_NOTICE "calibrate_delay_direct() dropping "
- "min bogoMips estimate %d = %lu\n",
+ pr_notice("calibrate_delay_direct() dropping min bogoMips estimate %d = %lu\n",
min, measured_times[min]);
measured_times[min] = 0;
min = max;
} else {
- printk(KERN_NOTICE "calibrate_delay_direct() dropping "
- "max bogoMips estimate %d = %lu\n",
+ pr_notice("calibrate_delay_direct() dropping max bogoMips estimate %d = %lu\n",
max, measured_times[max]);
measured_times[max] = 0;
max = min;
@@ -160,9 +158,7 @@ static unsigned long calibrate_delay_direct(void)
}
- printk(KERN_NOTICE "calibrate_delay_direct() failed to get a good "
- "estimate for loops_per_jiffy.\nProbably due to long platform "
- "interrupts. Consider using \"lpj=\" boot option.\n");
+ pr_notice("calibrate_delay_direct() failed to get a good estimate for loops_per_jiffy.\nProbably due to long platform interrupts. Consider using \"lpj=\" boot option.\n");
return 0;
}
#else
@@ -280,23 +276,19 @@ void calibrate_delay(void)
if (per_cpu(cpu_loops_per_jiffy, this_cpu)) {
lpj = per_cpu(cpu_loops_per_jiffy, this_cpu);
if (!printed)
- pr_info("Calibrating delay loop (skipped) "
- "already calibrated this CPU");
+ pr_info("Calibrating delay loop (skipped) already calibrated this CPU");
} else if (preset_lpj) {
lpj = preset_lpj;
if (!printed)
- pr_info("Calibrating delay loop (skipped) "
- "preset value.. ");
+ pr_info("Calibrating delay loop (skipped) preset value.. ");
} else if ((!printed) && lpj_fine) {
lpj = lpj_fine;
- pr_info("Calibrating delay loop (skipped), "
- "value calculated using timer frequency.. ");
+ pr_info("Calibrating delay loop (skipped), value calculated using timer frequency.. ");
} else if ((lpj = calibrate_delay_is_known())) {
;
} else if ((lpj = calibrate_delay_direct()) != 0) {
if (!printed)
- pr_info("Calibrating delay using timer "
- "specific routine.. ");
+ pr_info("Calibrating delay using timer specific routine.. ");
} else {
if (!printed)
pr_info("Calibrating delay loop... ");
--
1.9.1
next reply other threads:[~2014-10-11 16:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-11 16:31 Rasmus Wriedt Larsen [this message]
2014-10-11 16:40 ` Joe Perches
2014-10-11 17:23 ` Rasmus Wriedt Larsen
2014-10-11 17:36 ` Joe Perches
2014-10-13 10:12 ` [PATCH v2] " Rasmus Wriedt Larsen
2014-12-08 20:56 ` Rasmus Wriedt Larsen
2014-12-09 0:24 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413045075-10416-1-git-send-email-rasmuswriedtlarsen@gmail.com \
--to=rasmuswriedtlarsen@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pdeschrijver@nvidia.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=swarren@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome