Skip to content

Commit

Permalink
dma-buf: update debugfs output
Browse files Browse the repository at this point in the history
Russell King observed 'wierd' looking output from debugfs, and also suggested
better ways of getting device names (use KBUILD_MODNAME, dev_name())

This patch addresses these issues to make the debugfs output correct and better
looking.

While at it, replace seq_printf with seq_puts to remove the checkpatch.pl
warnings.

Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
  • Loading branch information
sumitsemwal committed Feb 13, 2014
1 parent 45f7fdc commit c0b00a5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
25 changes: 12 additions & 13 deletions drivers/base/dma-buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -616,36 +616,35 @@ static int dma_buf_describe(struct seq_file *s)
if (ret)
return ret;

seq_printf(s, "\nDma-buf Objects:\n");
seq_printf(s, "\texp_name\tsize\tflags\tmode\tcount\n");
seq_puts(s, "\nDma-buf Objects:\n");
seq_puts(s, "size\tflags\tmode\tcount\texp_name\n");

list_for_each_entry(buf_obj, &db_list.head, list_node) {
ret = mutex_lock_interruptible(&buf_obj->lock);

if (ret) {
seq_printf(s,
"\tERROR locking buffer object: skipping\n");
seq_puts(s,
"\tERROR locking buffer object: skipping\n");
continue;
}

seq_printf(s, "\t");

seq_printf(s, "\t%s\t%08zu\t%08x\t%08x\t%08ld\n",
buf_obj->exp_name, buf_obj->size,
seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\n",
buf_obj->size,
buf_obj->file->f_flags, buf_obj->file->f_mode,
(long)(buf_obj->file->f_count.counter));
(long)(buf_obj->file->f_count.counter),
buf_obj->exp_name);

seq_printf(s, "\t\tAttached Devices:\n");
seq_puts(s, "\tAttached Devices:\n");
attach_count = 0;

list_for_each_entry(attach_obj, &buf_obj->attachments, node) {
seq_printf(s, "\t\t");
seq_puts(s, "\t");

seq_printf(s, "%s\n", attach_obj->dev->init_name);
seq_printf(s, "%s\n", dev_name(attach_obj->dev));
attach_count++;
}

seq_printf(s, "\n\t\tTotal %d devices attached\n",
seq_printf(s, "Total %d devices attached\n\n",
attach_count);

count++;
Expand Down
2 changes: 1 addition & 1 deletion include/linux/dma-buf.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ struct dma_buf *dma_buf_export_named(void *priv, const struct dma_buf_ops *ops,
size_t size, int flags, const char *);

#define dma_buf_export(priv, ops, size, flags) \
dma_buf_export_named(priv, ops, size, flags, __FILE__)
dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME)

int dma_buf_fd(struct dma_buf *dmabuf, int flags);
struct dma_buf *dma_buf_get(int fd);
Expand Down

0 comments on commit c0b00a5

Please sign in to comment.