* [PATCH] Staging: android: alarm: fixed quoted string split across lines
@ 2012-05-20 9:54 Nasir Abed
2012-05-20 14:17 ` Dan Carpenter
2012-05-20 20:28 ` David Rientjes
0 siblings, 2 replies; 10+ messages in thread
From: Nasir Abed @ 2012-05-20 9:54 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, swetland, Nasir Abed
Fixed a warning quoted string split across lines.
Signed-off-by: Nasir Abed <nasirabed+kernel@gmail.com>
---
drivers/staging/android/alarm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c
index c68950b..4ea07bb 100644
--- a/drivers/staging/android/alarm.c
+++ b/drivers/staging/android/alarm.c
@@ -302,8 +302,8 @@ int android_alarm_set_rtc(struct timespec new_time)
}
ret = rtc_set_time(alarm_rtc_dev, &rtc_new_rtc_time);
if (ret < 0)
- pr_alarm(ERROR, "alarm_set_rtc: "
- "Failed to set RTC, time will be lost on reboot\n");
+ pr_alarm(ERROR,
+ "alarm_set_rtc: Failed to set RTC, time will be lost on reboot\n");
err:
wake_unlock(&alarm_rtc_wake_lock);
mutex_unlock(&alarm_setrtc_mutex);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: fixed quoted string split across lines
2012-05-20 9:54 [PATCH] Staging: android: alarm: fixed quoted string split across lines Nasir Abed
@ 2012-05-20 14:17 ` Dan Carpenter
2012-05-20 14:20 ` Nasir Abed
2012-05-20 20:28 ` David Rientjes
1 sibling, 1 reply; 10+ messages in thread
From: Dan Carpenter @ 2012-05-20 14:17 UTC (permalink / raw)
To: Nasir Abed; +Cc: gregkh, devel, swetland, Nasir Abed, linux-kernel
On Sun, May 20, 2012 at 11:54:19AM +0200, Nasir Abed wrote:
> Fixed a warning quoted string split across lines.
>
> Signed-off-by: Nasir Abed <nasirabed+kernel@gmail.com>
^^^^^^^^^^^^^^^^
This is not the email address you sent the mail from.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: fixed quoted string split across lines
2012-05-20 14:17 ` Dan Carpenter
@ 2012-05-20 14:20 ` Nasir Abed
2012-05-20 15:10 ` Dan Carpenter
0 siblings, 1 reply; 10+ messages in thread
From: Nasir Abed @ 2012-05-20 14:20 UTC (permalink / raw)
To: Dan Carpenter; +Cc: gregkh, devel, swetland, Nasir Abed, linux-kernel
Yeah, this is a tag, which I use. Like the one I used for:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=0bdd2b6
Cheers,
Nasir Abed
On Sun, May 20, 2012 at 4:17 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> On Sun, May 20, 2012 at 11:54:19AM +0200, Nasir Abed wrote:
>> Fixed a warning quoted string split across lines.
>>
>> Signed-off-by: Nasir Abed <nasirabed+kernel@gmail.com>
> ^^^^^^^^^^^^^^^^
> This is not the email address you sent the mail from.
>
> regards,
> dan carpenter
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: fixed quoted string split across lines
2012-05-20 14:20 ` Nasir Abed
@ 2012-05-20 15:10 ` Dan Carpenter
0 siblings, 0 replies; 10+ messages in thread
From: Dan Carpenter @ 2012-05-20 15:10 UTC (permalink / raw)
To: Nasir Abed; +Cc: devel, gregkh, Nasir Abed, linux-kernel, swetland
On Sun, May 20, 2012 at 04:20:45PM +0200, Nasir Abed wrote:
> Yeah, this is a tag, which I use. Like the one I used for:
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=0bdd2b6
>
Yeah, sorry, I should have caught it the first time. Please don't
do that.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: fixed quoted string split across lines
2012-05-20 9:54 [PATCH] Staging: android: alarm: fixed quoted string split across lines Nasir Abed
2012-05-20 14:17 ` Dan Carpenter
@ 2012-05-20 20:28 ` David Rientjes
2012-05-20 20:38 ` Joe Perches
1 sibling, 1 reply; 10+ messages in thread
From: David Rientjes @ 2012-05-20 20:28 UTC (permalink / raw)
To: Nasir Abed; +Cc: gregkh, devel, linux-kernel, swetland, Nasir Abed
On Sun, 20 May 2012, Nasir Abed wrote:
> diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c
> index c68950b..4ea07bb 100644
> --- a/drivers/staging/android/alarm.c
> +++ b/drivers/staging/android/alarm.c
> @@ -302,8 +302,8 @@ int android_alarm_set_rtc(struct timespec new_time)
> }
> ret = rtc_set_time(alarm_rtc_dev, &rtc_new_rtc_time);
> if (ret < 0)
> - pr_alarm(ERROR, "alarm_set_rtc: "
> - "Failed to set RTC, time will be lost on reboot\n");
> + pr_alarm(ERROR,
> + "alarm_set_rtc: Failed to set RTC, time will be lost on reboot\n");
> err:
> wake_unlock(&alarm_rtc_wake_lock);
> mutex_unlock(&alarm_setrtc_mutex);
Looks like this would benefit from using __func__ since it already doesn't
represent the correct function name.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: fixed quoted string split across lines
2012-05-20 20:28 ` David Rientjes
@ 2012-05-20 20:38 ` Joe Perches
2012-05-20 21:06 ` [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg Joe Perches
0 siblings, 1 reply; 10+ messages in thread
From: Joe Perches @ 2012-05-20 20:38 UTC (permalink / raw)
To: David Rientjes
Cc: Nasir Abed, gregkh, devel, linux-kernel, swetland, Nasir Abed
On Sun, 2012-05-20 at 13:28 -0700, David Rientjes wrote:
> On Sun, 20 May 2012, Nasir Abed wrote:
>
> > diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c
> > index c68950b..4ea07bb 100644
> > --- a/drivers/staging/android/alarm.c
> > +++ b/drivers/staging/android/alarm.c
> > @@ -302,8 +302,8 @@ int android_alarm_set_rtc(struct timespec new_time)
> > }
> > ret = rtc_set_time(alarm_rtc_dev, &rtc_new_rtc_time);
> > if (ret < 0)
> > - pr_alarm(ERROR, "alarm_set_rtc: "
> > - "Failed to set RTC, time will be lost on reboot\n");
> > + pr_alarm(ERROR,
> > + "alarm_set_rtc: Failed to set RTC, time will be lost on reboot\n");
> > err:
> > wake_unlock(&alarm_rtc_wake_lock);
> > mutex_unlock(&alarm_setrtc_mutex);
>
> Looks like this would benefit from using __func__ since it already doesn't
> represent the correct function name.
true.
Somewhat related, pr_alarm is a poor name choice.
It should probably called alarm_dbg.
o it's a duplicated #define
it should be in some common #include
o it's a debug test that emits at KERN_INFO
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg
2012-05-20 20:38 ` Joe Perches
@ 2012-05-20 21:06 ` Joe Perches
2012-05-20 21:26 ` David Rientjes
0 siblings, 1 reply; 10+ messages in thread
From: Joe Perches @ 2012-05-20 21:06 UTC (permalink / raw)
To: David Rientjes
Cc: Nasir Abed, gregkh, devel, linux-kernel, swetland, Nasir Abed
Rename a macro to make it explicit it's for debugging.
Use %s: __func__ instead of embedding function names.
Coalesce formats, align arguments.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/staging/android/alarm-dev.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c
index 53ce6ec..32614d6 100644
--- a/drivers/staging/android/alarm-dev.c
+++ b/drivers/staging/android/alarm-dev.c
@@ -29,16 +29,14 @@
#define ANDROID_ALARM_PRINT_IO (1U << 1)
#define ANDROID_ALARM_PRINT_INT (1U << 2)
-
static int debug_mask = ANDROID_ALARM_PRINT_INFO;
module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP);
-#define pr_alarm(debug_level_mask, args...) \
- do { \
- if (debug_mask & ANDROID_ALARM_PRINT_##debug_level_mask) { \
- pr_info(args); \
- } \
- } while (0)
+#define alarm_dbg(debug_level_mask, fmt, ...) \
+do { \
+ if (debug_mask & ANDROID_ALARM_PRINT_##debug_level_mask) \
+ pr_info(fmt, ##__VA_ARGS__); \
+} while (0)
#define ANDROID_ALARM_WAKEUP_MASK ( \
ANDROID_ALARM_RTC_WAKEUP_MASK | \
@@ -138,7 +136,7 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
switch (ANDROID_ALARM_BASE_CMD(cmd)) {
case ANDROID_ALARM_CLEAR(0):
spin_lock_irqsave(&alarm_slock, flags);
- pr_alarm(IO, "alarm %d clear\n", alarm_type);
+ alarm_dbg(IO, "alarm %d clear\n", alarm_type);
devalarm_try_to_cancel(&alarms[alarm_type]);
if (alarm_pending) {
alarm_pending &= ~alarm_type_mask;
@@ -167,8 +165,9 @@ static long alarm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
from_old_alarm_set:
spin_lock_irqsave(&alarm_slock, flags);
- pr_alarm(IO, "alarm %d set %ld.%09ld\n", alarm_type,
- new_alarm_time.tv_sec, new_alarm_time.tv_nsec);
+ alarm_dbg(IO, "alarm %d set %ld.%09ld\n",
+ alarm_type,
+ new_alarm_time.tv_sec, new_alarm_time.tv_nsec);
alarm_enabled |= alarm_type_mask;
devalarm_start(&alarms[alarm_type],
timespec_to_ktime(new_alarm_time));
@@ -179,7 +178,7 @@ from_old_alarm_set:
/* fall though */
case ANDROID_ALARM_WAIT:
spin_lock_irqsave(&alarm_slock, flags);
- pr_alarm(IO, "alarm wait\n");
+ alarm_dbg(IO, "alarm wait\n");
if (!alarm_pending && wait_pending) {
__pm_relax(&alarm_wake_lock);
wait_pending = 0;
@@ -260,9 +259,10 @@ static int alarm_release(struct inode *inode, struct file *file)
for (i = 0; i < ANDROID_ALARM_TYPE_COUNT; i++) {
uint32_t alarm_type_mask = 1U << i;
if (alarm_enabled & alarm_type_mask) {
- pr_alarm(INFO, "alarm_release: clear alarm, "
- "pending %d\n",
- !!(alarm_pending & alarm_type_mask));
+ alarm_dbg(INFO,
+ "%s: clear alarm, pending %d\n",
+ __func__,
+ !!(alarm_pending & alarm_type_mask));
alarm_enabled &= ~alarm_type_mask;
}
spin_unlock_irqrestore(&alarm_slock, flags);
@@ -271,8 +271,8 @@ static int alarm_release(struct inode *inode, struct file *file)
}
if (alarm_pending | wait_pending) {
if (alarm_pending)
- pr_alarm(INFO, "alarm_release: clear "
- "pending alarms %x\n", alarm_pending);
+ alarm_dbg(INFO, "%s: clear pending alarms %x\n",
+ __func__, alarm_pending);
__pm_relax(&alarm_wake_lock);
wait_pending = 0;
alarm_pending = 0;
@@ -288,7 +288,7 @@ static void devalarm_triggered(struct devalarm *alarm)
unsigned long flags;
uint32_t alarm_type_mask = 1U << alarm->type;
- pr_alarm(INT, "devalarm_triggered type %d\n", alarm->type);
+ alarm_dbg(INT, "%s: type %d\n", __func__, alarm->type);
spin_lock_irqsave(&alarm_slock, flags);
if (alarm_enabled & alarm_type_mask) {
__pm_wakeup_event(&alarm_wake_lock, 5000); /* 5secs */
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg
2012-05-20 21:06 ` [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg Joe Perches
@ 2012-05-20 21:26 ` David Rientjes
2012-05-21 10:49 ` Nasir Abed
0 siblings, 1 reply; 10+ messages in thread
From: David Rientjes @ 2012-05-20 21:26 UTC (permalink / raw)
To: Joe Perches; +Cc: Nasir Abed, gregkh, devel, linux-kernel, swetland, Nasir Abed
On Sun, 20 May 2012, Joe Perches wrote:
> Rename a macro to make it explicit it's for debugging.
>
> Use %s: __func__ instead of embedding function names.
> Coalesce formats, align arguments.
>
> Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: David Rientjes <rientjes@google.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg
2012-05-20 21:26 ` David Rientjes
@ 2012-05-21 10:49 ` Nasir Abed
2012-05-21 11:37 ` Dan Carpenter
0 siblings, 1 reply; 10+ messages in thread
From: Nasir Abed @ 2012-05-21 10:49 UTC (permalink / raw)
To: David Rientjes; +Cc: Joe Perches, gregkh, devel, linux-kernel, swetland
Shouldn't:
[PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg
Be:
[PATCH] Staging: android: alarm-dev: Rename pr_alarm to alarm_dbg
Cheers,
Nasir Abed
On Sun, May 20, 2012 at 11:26 PM, David Rientjes <rientjes@google.com> wrote:
> On Sun, 20 May 2012, Joe Perches wrote:
>
>> Rename a macro to make it explicit it's for debugging.
>>
>> Use %s: __func__ instead of embedding function names.
>> Coalesce formats, align arguments.
>>
>> Signed-off-by: Joe Perches <joe@perches.com>
>
> Acked-by: David Rientjes <rientjes@google.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg
2012-05-21 10:49 ` Nasir Abed
@ 2012-05-21 11:37 ` Dan Carpenter
0 siblings, 0 replies; 10+ messages in thread
From: Dan Carpenter @ 2012-05-21 11:37 UTC (permalink / raw)
To: Nasir Abed
Cc: David Rientjes, Joe Perches, gregkh, devel, linux-kernel, swetland
On Mon, May 21, 2012 at 12:49:33PM +0200, Nasir Abed wrote:
> Shouldn't:
> [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg
> Be:
> [PATCH] Staging: android: alarm-dev: Rename pr_alarm to alarm_dbg
>
Or even better "Staging: android-alarm:" but nobody cares one way or
the other. Stop bellyaching about nonsense things. :P
regards,
dan carpenter
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-05-21 11:33 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-20 9:54 [PATCH] Staging: android: alarm: fixed quoted string split across lines Nasir Abed
2012-05-20 14:17 ` Dan Carpenter
2012-05-20 14:20 ` Nasir Abed
2012-05-20 15:10 ` Dan Carpenter
2012-05-20 20:28 ` David Rientjes
2012-05-20 20:38 ` Joe Perches
2012-05-20 21:06 ` [PATCH] Staging: android: alarm: Rename pr_alarm to alarm_dbg Joe Perches
2012-05-20 21:26 ` David Rientjes
2012-05-21 10:49 ` Nasir Abed
2012-05-21 11:37 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).