aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma-buf/dma-buf.c
diff options
context:
space:
mode:
authorJagan Teki <jteki@openedev.com>2015-05-20 15:39:31 -0400
committerSumit Semwal <sumit.semwal@linaro.org>2015-05-21 01:59:59 -0400
commit5136629dc5a19701746abd7c8ad98ce0b84dda1d (patch)
tree4e515e62fdc1532188c77e997ac577b98017b9de /drivers/dma-buf/dma-buf.c
parent9abdffe286c1532a54d5aee31571d3029be4026c (diff)
dma-buf: Minor coding style fixes
- WARNING: Missing a blank line after declarations - WARNING: line over 80 characters - WARNING: please, no space before tabs Signed-off-by: Jagan Teki <jteki@openedev.com> Cc: Sumit Semwal <sumit.semwal@linaro.org> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'drivers/dma-buf/dma-buf.c')
-rw-r--r--drivers/dma-buf/dma-buf.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 63a9914e42b8..155c1464948e 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -287,6 +287,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
287 struct reservation_object *resv = exp_info->resv; 287 struct reservation_object *resv = exp_info->resv;
288 struct file *file; 288 struct file *file;
289 size_t alloc_size = sizeof(struct dma_buf); 289 size_t alloc_size = sizeof(struct dma_buf);
290
290 if (!exp_info->resv) 291 if (!exp_info->resv)
291 alloc_size += sizeof(struct reservation_object); 292 alloc_size += sizeof(struct reservation_object);
292 else 293 else
@@ -553,7 +554,8 @@ int dma_buf_begin_cpu_access(struct dma_buf *dmabuf, size_t start, size_t len,
553 return -EINVAL; 554 return -EINVAL;
554 555
555 if (dmabuf->ops->begin_cpu_access) 556 if (dmabuf->ops->begin_cpu_access)
556 ret = dmabuf->ops->begin_cpu_access(dmabuf, start, len, direction); 557 ret = dmabuf->ops->begin_cpu_access(dmabuf, start,
558 len, direction);
557 559
558 return ret; 560 return ret;
559} 561}
@@ -657,7 +659,7 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);
657 * @dmabuf: [in] buffer that should back the vma 659 * @dmabuf: [in] buffer that should back the vma
658 * @vma: [in] vma for the mmap 660 * @vma: [in] vma for the mmap
659 * @pgoff: [in] offset in pages where this mmap should start within the 661 * @pgoff: [in] offset in pages where this mmap should start within the
660 * dma-buf buffer. 662 * dma-buf buffer.
661 * 663 *
662 * This function adjusts the passed in vma so that it points at the file of the 664 * This function adjusts the passed in vma so that it points at the file of the
663 * dma_buf operation. It also adjusts the starting pgoff and does bounds 665 * dma_buf operation. It also adjusts the starting pgoff and does bounds
@@ -834,6 +836,7 @@ static int dma_buf_describe(struct seq_file *s)
834static int dma_buf_show(struct seq_file *s, void *unused) 836static int dma_buf_show(struct seq_file *s, void *unused)
835{ 837{
836 void (*func)(struct seq_file *) = s->private; 838 void (*func)(struct seq_file *) = s->private;
839
837 func(s); 840 func(s);
838 return 0; 841 return 0;
839} 842}
@@ -855,7 +858,9 @@ static struct dentry *dma_buf_debugfs_dir;
855static int dma_buf_init_debugfs(void) 858static int dma_buf_init_debugfs(void)
856{ 859{
857 int err = 0; 860 int err = 0;
861
858 dma_buf_debugfs_dir = debugfs_create_dir("dma_buf", NULL); 862 dma_buf_debugfs_dir = debugfs_create_dir("dma_buf", NULL);
863
859 if (IS_ERR(dma_buf_debugfs_dir)) { 864 if (IS_ERR(dma_buf_debugfs_dir)) {
860 err = PTR_ERR(dma_buf_debugfs_dir); 865 err = PTR_ERR(dma_buf_debugfs_dir);
861 dma_buf_debugfs_dir = NULL; 866 dma_buf_debugfs_dir = NULL;