mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-23 20:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

dma: Rename free() to rfree()

Browse Source 
This function name conflicts with our desire to #define free() to
something else on sandbox. Since it deals with resources, rename it to
rfree().

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-02-03 07:35:55 -07:00
parent fb8c0d595f
commit aae9588223
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma/dma-uclass.c
View File

@ -122,10 +122,10 @@ int dma_free(struct dma *dma)
debug("%s(dma=%p)\n", __func__, dma); debug("%s(dma=%p)\n", __func__, dma);
if (!ops->free) if (!ops->rfree)
return 0; return 0;
return ops->free(dma); return ops->rfree(dma);
} }
int dma_enable(struct dma *dma) int dma_enable(struct dma *dma)

4
drivers/dma/sandbox-dma-test.c
View File

@ -88,7 +88,7 @@ static int sandbox_dma_request(struct dma *dma)
return 0; return 0;
} }
static int sandbox_dma_free(struct dma *dma) static int sandbox_dma_rfree(struct dma *dma)
{ {
struct sandbox_dma_dev *ud = dev_get_priv(dma->dev); struct sandbox_dma_dev *ud = dev_get_priv(dma->dev);
struct sandbox_dma_chan *uc; struct sandbox_dma_chan *uc;
@ -229,7 +229,7 @@ static const struct dma_ops sandbox_dma_ops = {
.transfer = sandbox_dma_transfer, .transfer = sandbox_dma_transfer,
.of_xlate = sandbox_dma_of_xlate, .of_xlate = sandbox_dma_of_xlate,
.request = sandbox_dma_request, .request = sandbox_dma_request,
.free = sandbox_dma_free, .rfree = sandbox_dma_rfree,
.enable = sandbox_dma_enable, .enable = sandbox_dma_enable,
.disable = sandbox_dma_disable, .disable = sandbox_dma_disable,
.send = sandbox_dma_send, .send = sandbox_dma_send,

4
drivers/dma/ti/k3-udma.c
View File

@ -1551,7 +1551,7 @@ static int udma_request(struct dma *dma)
return 0; return 0;
} }
static int udma_free(struct dma *dma) static int udma_rfree(struct dma *dma)
{ {
struct udma_dev *ud = dev_get_priv(dma->dev); struct udma_dev *ud = dev_get_priv(dma->dev);
struct udma_chan *uc; struct udma_chan *uc;
@ -1846,7 +1846,7 @@ static const struct dma_ops udma_ops = {
.transfer = udma_transfer, .transfer = udma_transfer,
.of_xlate = udma_of_xlate, .of_xlate = udma_of_xlate,
.request = udma_request, .request = udma_request,
.free = udma_free, .rfree = udma_rfree,
.enable = udma_enable, .enable = udma_enable,
.disable = udma_disable, .disable = udma_disable,
.send = udma_send, .send = udma_send,

4
include/dma-uclass.h
View File

@ -58,14 +58,14 @@ struct dma_ops {
*/ */
int (*request)(struct dma *dma); int (*request)(struct dma *dma);
/** /**
* free - Free a previously requested dma. * rfree - Free a previously requested dma.
* *
* This is the implementation of the client dma_free() API. * This is the implementation of the client dma_free() API.
* *
* @dma: The DMA to free. * @dma: The DMA to free.
* @return 0 if OK, or a negative error code. * @return 0 if OK, or a negative error code.
*/ */
int (*free)(struct dma *dma); int (*rfree)(struct dma *dma);
/** /**
* enable() - Enable a DMA Channel. * enable() - Enable a DMA Channel.
* *