korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 12:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

dma-buf: heaps: Deduplicate docs and adopt common format

Browse Source 
The docs for dma_heap_get_name were incorrect, and since they were
duplicated in the header they were wrong there too.

The docs formatting was inconsistent so I tried to make it more
consistent across functions since I'm already in here doing cleanup.

Remove multiple unused includes and alphabetize.

Signed-off-by: T.J. Mercier <tjmercier@google.com>
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
[Yong: Just add a comment for "priv" to mute build warning]
Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240720071606.27930-5-yunfei.dong@mediatek.com
Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
T.J. Mercier 2024-07-20 15:15:42 +08:00 committed by Christian König
parent bf32a3a126
commit d5e79eeba3
2 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/dma-buf/dma-heap.c
View File

@ -7,17 +7,15 @@
*/ */
#include <linux/cdev.h> #include <linux/cdev.h>
#include <linux/debugfs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-buf.h> #include <linux/dma-buf.h>
#include <linux/err.h>
#include <linux/xarray.h>
#include <linux/list.h>
#include <linux/slab.h>
#include <linux/nospec.h>
#include <linux/uaccess.h>
#include <linux/syscalls.h>
#include <linux/dma-heap.h> #include <linux/dma-heap.h>
#include <linux/err.h>
#include <linux/list.h>
#include <linux/nospec.h>
#include <linux/syscalls.h>
#include <linux/uaccess.h>
#include <linux/xarray.h>
#include <uapi/linux/dma-heap.h> #include <uapi/linux/dma-heap.h>
#define DEVNAME "dma_heap" #define DEVNAME "dma_heap"
@ -28,9 +26,10 @@
* struct dma_heap - represents a dmabuf heap in the system * struct dma_heap - represents a dmabuf heap in the system
* @name: used for debugging/device-node name * @name: used for debugging/device-node name
* @ops: ops struct for this heap * @ops: ops struct for this heap
* @heap_devt heap device node * @priv: private data for this heap
* @list list head connecting to list of heaps * @heap_devt: heap device node
* @heap_cdev heap char device * @list: list head connecting to list of heaps
* @heap_cdev: heap char device
* *
* Represents a heap of memory from which buffers can be made. * Represents a heap of memory from which buffers can be made.
*/ */
@ -193,11 +192,11 @@ static const struct file_operations dma_heap_fops = {
}; };
/** /**
* dma_heap_get_drvdata() - get per-subdriver data for the heap * dma_heap_get_drvdata - get per-heap driver data
* @heap: DMA-Heap to retrieve private data for * @heap: DMA-Heap to retrieve private data for
* *
* Returns: * Returns:
* The per-subdriver data for the heap. * The per-heap data for the heap.
*/ */
void *dma_heap_get_drvdata(struct dma_heap *heap) void *dma_heap_get_drvdata(struct dma_heap *heap)
{ {
@ -205,8 +204,8 @@ void *dma_heap_get_drvdata(struct dma_heap *heap)
} }
/** /**
* dma_heap_get_name() - get heap name * dma_heap_get_name - get heap name
* @heap: DMA-Heap to retrieve private data for * @heap: DMA-Heap to retrieve the name of
* *
* Returns: * Returns:
* The char* for the heap name. * The char* for the heap name.
@ -216,6 +215,10 @@ const char *dma_heap_get_name(struct dma_heap *heap)
return heap->name; return heap->name;
} }
/**
* dma_heap_add - adds a heap to dmabuf heaps
* @exp_info: information needed to register this heap
*/
struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info) struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info)
{ {
struct dma_heap *heap, *h, *err_ret; struct dma_heap *heap, *h, *err_ret;

19
include/linux/dma-heap.h
View File

@ -9,7 +9,6 @@
#ifndef _DMA_HEAPS_H #ifndef _DMA_HEAPS_H
#define _DMA_HEAPS_H #define _DMA_HEAPS_H
#include <linux/cdev.h>
#include <linux/types.h> #include <linux/types.h>
struct dma_heap; struct dma_heap;
@ -41,28 +40,10 @@ struct dma_heap_export_info {
void *priv; void *priv;
}; };
/**
* dma_heap_get_drvdata() - get per-heap driver data
* @heap: DMA-Heap to retrieve private data for
*
* Returns:
* The per-heap data for the heap.
*/
void *dma_heap_get_drvdata(struct dma_heap *heap); void *dma_heap_get_drvdata(struct dma_heap *heap);
/**
* dma_heap_get_name() - get heap name
* @heap: DMA-Heap to retrieve private data for
*
* Returns:
* The char* for the heap name.
*/
const char *dma_heap_get_name(struct dma_heap *heap); const char *dma_heap_get_name(struct dma_heap *heap);
/**
* dma_heap_add - adds a heap to dmabuf heaps
* @exp_info: information needed to register this heap
*/
struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info); struct dma_heap *dma_heap_add(const struct dma_heap_export_info *exp_info);
#endif /* _DMA_HEAPS_H */ #endif /* _DMA_HEAPS_H */