* [PATCH] staging: android: fix Missing a blank line after declarations warnings
@ 2014-05-28 8:52 Scott Weir
2014-05-28 21:30 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Scott Weir @ 2014-05-28 8:52 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel
This patch corrects coding style issue:
WARNING: Missing a black line after declarations
Signed-off-by: Scott Weir <sjw0410@gmail.com>
---
drivers/staging/android/sync_debug.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index 00efaf9..2dd3fcc 100644
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -95,12 +95,14 @@ static void sync_print_pt(struct seq_file *s, struct sync_pt *pt, bool fence)
if (status <= 0) {
struct timeval tv = ktime_to_timeval(pt->base.timestamp);
+
seq_printf(s, "@%ld.%06ld", tv.tv_sec, tv.tv_usec);
}
if (parent->ops->timeline_value_str &&
parent->ops->pt_value_str) {
char value[64];
+
parent->ops->pt_value_str(pt, value, sizeof(value));
seq_printf(s, ": %s", value);
if (fence) {
@@ -122,6 +124,7 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
if (obj->ops->timeline_value_str) {
char value[64];
+
obj->ops->timeline_value_str(obj, value, sizeof(value));
seq_printf(s, ": %s", value);
}
@@ -234,6 +237,7 @@ void sync_dump(void)
for (i = 0; i < s.count; i += DUMP_CHUNK) {
if ((s.count - i) > DUMP_CHUNK) {
char c = s.buf[i + DUMP_CHUNK];
+
s.buf[i + DUMP_CHUNK] = 0;
pr_cont("%s", s.buf + i);
s.buf[i + DUMP_CHUNK] = c;
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: android: fix Missing a blank line after declarations warnings
2014-05-28 8:52 [PATCH] staging: android: fix Missing a blank line after declarations warnings Scott Weir
@ 2014-05-28 21:30 ` Greg KH
2014-05-30 5:56 ` Scott Weir
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2014-05-28 21:30 UTC (permalink / raw)
To: Scott Weir; +Cc: devel, linux-kernel
On Wed, May 28, 2014 at 06:52:51PM +1000, Scott Weir wrote:
> This patch corrects coding style issue:
> WARNING: Missing a black line after declarations
>
> Signed-off-by: Scott Weir <sjw0410@gmail.com>
> ---
> drivers/staging/android/sync_debug.c | 4 ++++
This file isn't in my tree. Always work against linux-next, not Linus's
tree for new patches.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: android: fix Missing a blank line after declarations warnings
2014-05-28 21:30 ` Greg KH
@ 2014-05-30 5:56 ` Scott Weir
2014-05-31 4:19 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Scott Weir @ 2014-05-30 5:56 UTC (permalink / raw)
To: Greg KH; +Cc: devel, linux-kernel
On Wed, May 28, 2014 at 02:30:27PM -0700, Greg KH wrote:
> On Wed, May 28, 2014 at 06:52:51PM +1000, Scott Weir wrote:
> > This patch corrects coding style issue:
> > WARNING: Missing a black line after declarations
> >
> > Signed-off-by: Scott Weir <sjw0410@gmail.com>
> > ---
> > drivers/staging/android/sync_debug.c | 4 ++++
>
> This file isn't in my tree. Always work against linux-next, not Linus's
> tree for new patches.
>
> thanks,
>
> greg k-h
This patch was made against linux-next. Is it better to use your staging tree?
thanks
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] staging: android: fix Missing a blank line after declarations warnings
2014-05-30 5:56 ` Scott Weir
@ 2014-05-31 4:19 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2014-05-31 4:19 UTC (permalink / raw)
To: Scott Weir; +Cc: devel, linux-kernel
On Fri, May 30, 2014 at 03:56:44PM +1000, Scott Weir wrote:
> On Wed, May 28, 2014 at 02:30:27PM -0700, Greg KH wrote:
> > On Wed, May 28, 2014 at 06:52:51PM +1000, Scott Weir wrote:
> > > This patch corrects coding style issue:
> > > WARNING: Missing a black line after declarations
> > >
> > > Signed-off-by: Scott Weir <sjw0410@gmail.com>
> > > ---
> > > drivers/staging/android/sync_debug.c | 4 ++++
> >
> > This file isn't in my tree. Always work against linux-next, not Linus's
> > tree for new patches.
> >
> > thanks,
> >
> > greg k-h
>
> This patch was made against linux-next. Is it better to use your staging tree?
Yes, but normally it should also be fine to use linux-next.
I don't know where that sync_debug.c file is coming from, it's not in my
staging branch, some other tree must be creating it, which is
troublesome to me...
Anyway, sorry, but yes, work off of the staging-next branch of
staging.git on git.kernel.org and you should be fine.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-05-31 4:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-28 8:52 [PATCH] staging: android: fix Missing a blank line after declarations warnings Scott Weir
2014-05-28 21:30 ` Greg KH
2014-05-30 5:56 ` Scott Weir
2014-05-31 4:19 ` Greg KH
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).