Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd3e2208 authored by Mathias Krause's avatar Mathias Krause Committed by Sumit Semwal
Browse files

dma-buf: remove dma_buf_debugfs_create_file() 



There is only a single user of dma_buf_debugfs_create_file() and that
one got the function pointer cast wrong. With that one fixed, there is
no need to have a wrapper for debugfs_create_file(), just call it
directly.

With no users left, we can remove dma_buf_debugfs_create_file().

While at it, simplify the error handling in dma_buf_init_debugfs()
slightly.

Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1466339491-12639-2-git-send-email-minipli@googlemail.com
parent b7479990

drivers/dma-buf/dma-buf.c

+9 −20
Original line number Diff line number Diff line
@@ -895,22 +895,22 @@ static struct dentry *dma_buf_debugfs_dir; 


static int dma_buf_init_debugfs(void)

{

	struct dentry *d;

	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;

		return err;

	}

	d = debugfs_create_dir("dma_buf", NULL);

	if (IS_ERR(d))

		return PTR_ERR(d);



	err = dma_buf_debugfs_create_file("bufinfo", NULL);

	dma_buf_debugfs_dir = d;



	if (err) {

	d = debugfs_create_file("bufinfo", S_IRUGO, dma_buf_debugfs_dir,

				NULL, &dma_buf_debug_fops);

	if (IS_ERR(d)) {

		pr_debug("dma_buf: debugfs: failed to create node bufinfo\n");

		debugfs_remove_recursive(dma_buf_debugfs_dir);

		dma_buf_debugfs_dir = NULL;

		err = PTR_ERR(d);

	}



	return err;
@@ -921,17 +921,6 @@ static void dma_buf_uninit_debugfs(void) 
	if (dma_buf_debugfs_dir)

		debugfs_remove_recursive(dma_buf_debugfs_dir);

}



int dma_buf_debugfs_create_file(const char *name,

				int (*write)(struct seq_file *))

{

	struct dentry *d;



	d = debugfs_create_file(name, S_IRUGO, dma_buf_debugfs_dir,

			write, &dma_buf_debug_fops);



	return PTR_ERR_OR_ZERO(d);

}

#else

static inline int dma_buf_init_debugfs(void)

{

include/linux/dma-buf.h

+0 −2
Original line number Diff line number Diff line
@@ -242,6 +242,4 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *, 
		 unsigned long);

void *dma_buf_vmap(struct dma_buf *);

void dma_buf_vunmap(struct dma_buf *, void *vaddr);

int dma_buf_debugfs_create_file(const char *name,

				int (*write)(struct seq_file *));

#endif /* __DMA_BUF_H__ */