Skip to content

Commit

Permalink
dma-buf: Minor coding style fixes
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Jagan Teki authored and Sumit Semwal committed May 21, 2015
1 parent 9abdffe commit 5136629
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
9 changes: 7 additions & 2 deletions drivers/dma-buf/dma-buf.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
struct reservation_object *resv = exp_info->resv;
struct file *file;
size_t alloc_size = sizeof(struct dma_buf);

if (!exp_info->resv)
alloc_size += sizeof(struct reservation_object);
else
Expand Down Expand Up @@ -553,7 +554,8 @@ int dma_buf_begin_cpu_access(struct dma_buf *dmabuf, size_t start, size_t len,
return -EINVAL;

if (dmabuf->ops->begin_cpu_access)
ret = dmabuf->ops->begin_cpu_access(dmabuf, start, len, direction);
ret = dmabuf->ops->begin_cpu_access(dmabuf, start,
len, direction);

return ret;
}
Expand Down Expand Up @@ -657,7 +659,7 @@ EXPORT_SYMBOL_GPL(dma_buf_kunmap);
* @dmabuf: [in] buffer that should back the vma
* @vma: [in] vma for the mmap
* @pgoff: [in] offset in pages where this mmap should start within the
* dma-buf buffer.
* dma-buf buffer.
*
* This function adjusts the passed in vma so that it points at the file of the
* dma_buf operation. It also adjusts the starting pgoff and does bounds
Expand Down Expand Up @@ -834,6 +836,7 @@ static int dma_buf_describe(struct seq_file *s)
static int dma_buf_show(struct seq_file *s, void *unused)
{
void (*func)(struct seq_file *) = s->private;

func(s);
return 0;
}
Expand All @@ -855,7 +858,9 @@ static struct dentry *dma_buf_debugfs_dir;
static int dma_buf_init_debugfs(void)
{
int err = 0;

dma_buf_debugfs_dir = debugfs_create_dir("dma_buf", NULL);

if (IS_ERR(dma_buf_debugfs_dir)) {
err = PTR_ERR(dma_buf_debugfs_dir);
dma_buf_debugfs_dir = NULL;
Expand Down
9 changes: 6 additions & 3 deletions drivers/dma-buf/reservation.c
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,8 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj,
rcu_read_lock();

if (wait_all) {
struct reservation_object_list *fobj = rcu_dereference(obj->fence);
struct reservation_object_list *fobj =
rcu_dereference(obj->fence);

if (fobj)
shared_count = fobj->shared_count;
Expand Down Expand Up @@ -429,7 +430,8 @@ bool reservation_object_test_signaled_rcu(struct reservation_object *obj,
if (test_all) {
unsigned i;

struct reservation_object_list *fobj = rcu_dereference(obj->fence);
struct reservation_object_list *fobj =
rcu_dereference(obj->fence);

if (fobj)
shared_count = fobj->shared_count;
Expand Down Expand Up @@ -462,7 +464,8 @@ bool reservation_object_test_signaled_rcu(struct reservation_object *obj,
goto unlock_retry;

if (fence_excl) {
ret = reservation_object_test_signaled_single(fence_excl);
ret = reservation_object_test_signaled_single(
fence_excl);
if (ret < 0)
goto unlock_retry;
}
Expand Down
8 changes: 7 additions & 1 deletion drivers/dma-buf/seqno-fence.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,28 @@
static const char *seqno_fence_get_driver_name(struct fence *fence)
{
struct seqno_fence *seqno_fence = to_seqno_fence(fence);

return seqno_fence->ops->get_driver_name(fence);
}

static const char *seqno_fence_get_timeline_name(struct fence *fence)
{
struct seqno_fence *seqno_fence = to_seqno_fence(fence);

return seqno_fence->ops->get_timeline_name(fence);
}

static bool seqno_enable_signaling(struct fence *fence)
{
struct seqno_fence *seqno_fence = to_seqno_fence(fence);

return seqno_fence->ops->enable_signaling(fence);
}

static bool seqno_signaled(struct fence *fence)
{
struct seqno_fence *seqno_fence = to_seqno_fence(fence);

return seqno_fence->ops->signaled && seqno_fence->ops->signaled(fence);
}

Expand All @@ -56,9 +60,11 @@ static void seqno_release(struct fence *fence)
fence_free(&f->base);
}

static signed long seqno_wait(struct fence *fence, bool intr, signed long timeout)
static signed long seqno_wait(struct fence *fence, bool intr,
signed long timeout)
{
struct seqno_fence *f = to_seqno_fence(fence);

return f->ops->wait(fence, intr, timeout);
}

Expand Down

0 comments on commit 5136629

Please sign in to comment.