This patch changes seq_printf for seq_puts in binder.c.
It fixes the warnings emitted by checkpatch.pl.
Signed-off-by: Mathieu Rhéaume <[email protected]>
---
drivers/staging/android/binder.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 09edebb..f3d4a1f 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -3272,7 +3272,7 @@ binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)
static void print_binder_transaction(struct seq_file *m, const char *prefix,
struct binder_transaction *t)
{
- seq_printf(m,
+ seq_puts(m,
"%s %d: %p from %d:%d to %d:%d code %x flags %x pri %ld r%d",
prefix, t->debug_id, t,
t->from ? t->from->proc->pid : 0,
@@ -3287,7 +3287,7 @@ static void print_binder_transaction(struct seq_file *m, const char *prefix,
if (t->buffer->target_node)
seq_printf(m, " node %d",
t->buffer->target_node->debug_id);
- seq_printf(m, " size %zd:%zd data %p\n",
+ seq_puts(m, " size %zd:%zd data %p\n",
t->buffer->data_size, t->buffer->offsets_size,
t->buffer->data);
}
@@ -3656,7 +3656,7 @@ static int binder_proc_show(struct seq_file *m, void *unused)
static void print_binder_transaction_log_entry(struct seq_file *m,
struct binder_transaction_log_entry *e)
{
- seq_printf(m,
+ seq_puts(m,
"%d: %s from %d:%d to %d:%d node %d handle %d size %d:%d\n",
e->debug_id, (e->call_type == 2) ? "reply" :
((e->call_type == 1) ? "async" : "call "), e->from_proc,
--
1.8.3.1
On Tue, 2013-10-01 at 21:57 -0400, Mathieu Rh?aume wrote:
> This patch changes seq_printf for seq_puts in binder.c.
> It fixes the warnings emitted by checkpatch.pl.
Please realign function argument to the open parenthesis.
> diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
[]
> @@ -3272,7 +3272,7 @@ binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)
> static void print_binder_transaction(struct seq_file *m, const char *prefix,
> struct binder_transaction *t)
> {
> - seq_printf(m,
> + seq_puts(m,
> "%s %d: %p from %d:%d to %d:%d code %x flags %x pri %ld r%d",
> prefix, t->debug_id, t,
> t->from ? t->from->proc->pid : 0,
This should be
seq_puts(m, "%s..."
prefix, etc...
using two tabs then 1 space to align to open parenthesis
> @@ -3287,7 +3287,7 @@ static void print_binder_transaction(struct seq_file *m, const char *prefix,
> if (t->buffer->target_node)
> seq_printf(m, " node %d",
> t->buffer->target_node->debug_id);
> - seq_printf(m, " size %zd:%zd data %p\n",
> + seq_puts(m, " size %zd:%zd data %p\n",
> t->buffer->data_size, t->buffer->offsets_size,
seq_puts(m, " size...",
t->buffer->etc...
etc...
On 02/10/13 11:57, Mathieu Rhéaume wrote:
> This patch changes seq_printf for seq_puts in binder.c.
> It fixes the warnings emitted by checkpatch.pl.
>
> Signed-off-by: Mathieu Rhéaume <[email protected]>
> ---
> drivers/staging/android/binder.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
> index 09edebb..f3d4a1f 100644
> --- a/drivers/staging/android/binder.c
> +++ b/drivers/staging/android/binder.c
> @@ -3272,7 +3272,7 @@ binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer)
> static void print_binder_transaction(struct seq_file *m, const char *prefix,
> struct binder_transaction *t)
> {
> - seq_printf(m,
> + seq_puts(m,
> "%s %d: %p from %d:%d to %d:%d code %x flags %x pri %ld r%d",
> prefix, t->debug_id, t,
> t->from ? t->from->proc->pid : 0,
Umm, this won't compile. seq_puts() is defined as:
int seq_puts(struct seq_file *m, const char *s);
checkpatch.pl does indeed complain about uses of seq_printf() in
drivers/staging/android/binder.c which are passing formatted strings. At
a quick glance it looks like checkpatch.pl is only checking for the
format string on the same line as seq_printf(), so this files ugly
coding style confuses the check. Joe?
Anyway, please don't blindly change things in the kernel without at
least compile testing them.
~Ryan
On Wed, 2013-10-02 at 15:15 +1000, Ryan Mallon wrote:
> On 02/10/13 11:57, Mathieu Rh?aume wrote:
> > This patch changes seq_printf for seq_puts in binder.c.
> > It fixes the warnings emitted by checkpatch.pl.
[]
> Umm, this won't compile. seq_puts() is defined as:
>
> int seq_puts(struct seq_file *m, const char *s);
>
> checkpatch.pl does indeed complain about uses of seq_printf() in
> drivers/staging/android/binder.c which are passing formatted strings. At
> a quick glance it looks like checkpatch.pl is only checking for the
> format string on the same line as seq_printf(), so this files ugly
> coding style confuses the check. Joe?
True.
This patch should have fixed it. It's in -next already.
https://lkml.org/lkml/2013/9/13/698
> Anyway, please don't blindly change things in the kernel without at
> least compile testing them.
Yes, please.
On Tue, Oct 01, 2013 at 09:57:36PM -0400, Mathieu Rh?aume wrote:
> This patch changes seq_printf for seq_puts in binder.c.
> It fixes the warnings emitted by checkpatch.pl.
Which warnings? Seems like a false positive somehow because seq_puts()
is totally wrong here. This doesn't compile.
regards,
dan carpenter