[3/8] Revert "dma: Rename free() to rfree()"

Message ID 20200219193934.28456-4-simon.k.r.goldschmidt@gmail.com
State New
Headers show
Series
  • malloc: implement USE_DL_PREFIX using inline functions
Related show

Commit Message

Simon Goldschmidt Feb. 19, 2020, 7:39 p.m.
This reverts commit aae95882232a24ee49c89d0356febf3685a87c8a.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
---

 drivers/dma/dma-uclass.c       | 4 ++--
 drivers/dma/sandbox-dma-test.c | 4 ++--
 drivers/dma/ti/k3-udma.c       | 4 ++--
 include/dma-uclass.h           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

Comments

Simon Glass Feb. 20, 2020, 3:05 a.m. | #1
On Wed, 19 Feb 2020 at 12:40, Simon Goldschmidt
<simon.k.r.goldschmidt at gmail.com> wrote:
>
> This reverts commit aae95882232a24ee49c89d0356febf3685a87c8a.
>
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
> ---
>
>  drivers/dma/dma-uclass.c       | 4 ++--
>  drivers/dma/sandbox-dma-test.c | 4 ++--
>  drivers/dma/ti/k3-udma.c       | 4 ++--
>  include/dma-uclass.h           | 4 ++--
>  4 files changed, 8 insertions(+), 8 deletions(-)

Reviewed-by: Simon Glass <sjg at chromium.org>

But a commit message would be nice.

Patch

diff --git a/drivers/dma/dma-uclass.c b/drivers/dma/dma-uclass.c
index 9d5a7fc796..68e17ed1f9 100644
--- a/drivers/dma/dma-uclass.c
+++ b/drivers/dma/dma-uclass.c
@@ -123,10 +123,10 @@  int dma_free(struct dma *dma)
 
 	debug("%s(dma=%p)\n", __func__, dma);
 
-	if (!ops->rfree)
+	if (!ops->free)
 		return 0;
 
-	return ops->rfree(dma);
+	return ops->free(dma);
 }
 
 int dma_enable(struct dma *dma)
diff --git a/drivers/dma/sandbox-dma-test.c b/drivers/dma/sandbox-dma-test.c
index 234a7d2134..e8c809fa64 100644
--- a/drivers/dma/sandbox-dma-test.c
+++ b/drivers/dma/sandbox-dma-test.c
@@ -89,7 +89,7 @@  static int sandbox_dma_request(struct dma *dma)
 	return 0;
 }
 
-static int sandbox_dma_rfree(struct dma *dma)
+static int sandbox_dma_free(struct dma *dma)
 {
 	struct sandbox_dma_dev *ud = dev_get_priv(dma->dev);
 	struct sandbox_dma_chan *uc;
@@ -230,7 +230,7 @@  static const struct dma_ops sandbox_dma_ops = {
 	.transfer	= sandbox_dma_transfer,
 	.of_xlate	= sandbox_dma_of_xlate,
 	.request	= sandbox_dma_request,
-	.rfree		= sandbox_dma_rfree,
+	.free		= sandbox_dma_free,
 	.enable		= sandbox_dma_enable,
 	.disable	= sandbox_dma_disable,
 	.send		= sandbox_dma_send,
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index f274100f32..d6eb6d9339 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -1553,7 +1553,7 @@  static int udma_request(struct dma *dma)
 	return 0;
 }
 
-static int udma_rfree(struct dma *dma)
+static int udma_free(struct dma *dma)
 {
 	struct udma_dev *ud = dev_get_priv(dma->dev);
 	struct udma_chan *uc;
@@ -1848,7 +1848,7 @@  static const struct dma_ops udma_ops = {
 	.transfer	= udma_transfer,
 	.of_xlate	= udma_of_xlate,
 	.request	= udma_request,
-	.rfree		= udma_rfree,
+	.free		= udma_free,
 	.enable		= udma_enable,
 	.disable	= udma_disable,
 	.send		= udma_send,
diff --git a/include/dma-uclass.h b/include/dma-uclass.h
index 340437acc1..a1d9d26ac5 100644
--- a/include/dma-uclass.h
+++ b/include/dma-uclass.h
@@ -58,14 +58,14 @@  struct dma_ops {
 	 */
 	int (*request)(struct dma *dma);
 	/**
-	 * rfree - Free a previously requested dma.
+	 * free - Free a previously requested dma.
 	 *
 	 * This is the implementation of the client dma_free() API.
 	 *
 	 * @dma: The DMA to free.
 	 * @return 0 if OK, or a negative error code.
 	 */
-	int (*rfree)(struct dma *dma);
+	int (*free)(struct dma *dma);
 	/**
 	 * enable() - Enable a DMA Channel.
 	 *