diff mbox series

[4/8] Revert "clk: Rename free() to rfree()"

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

Commit Message

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

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

 drivers/clk/clk-ti-sci.c          | 2 +-
 drivers/clk/clk-uclass.c          | 4 ++--
 drivers/clk/clk_sandbox.c         | 2 +-
 drivers/clk/tegra/tegra-car-clk.c | 2 +-
 include/clk-uclass.h              | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

Comments

Simon Glass Feb. 20, 2020, 3:05 a.m. UTC | #1 
On Wed, 19 Feb 2020 at 12:40, Simon Goldschmidt
<simon.k.r.goldschmidt at gmail.com> wrote:
>
> This reverts commit fb8c0d595f1ad83bee5dd398b59b0ee16d8d15a9.
>
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
> ---
>
>  drivers/clk/clk-ti-sci.c          | 2 +-
>  drivers/clk/clk-uclass.c          | 4 ++--
>  drivers/clk/clk_sandbox.c         | 2 +-
>  drivers/clk/tegra/tegra-car-clk.c | 2 +-
>  include/clk-uclass.h              | 4 ++--
>  5 files changed, 7 insertions(+), 7 deletions(-)

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

Patch

diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index 82241d9f3f..e272003d30 100644
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -206,7 +206,7 @@  static const struct udevice_id ti_sci_clk_of_match[] = {
 static struct clk_ops ti_sci_clk_ops = {
 	.of_xlate = ti_sci_clk_of_xlate,
 	.request = ti_sci_clk_request,
-	.rfree = ti_sci_clk_free,
+	.free = ti_sci_clk_free,
 	.get_rate = ti_sci_clk_get_rate,
 	.set_rate = ti_sci_clk_set_rate,
 	.set_parent = ti_sci_clk_set_parent,
diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c
index 71878474eb..24353fae53 100644
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -426,10 +426,10 @@  int clk_free(struct clk *clk)
 		return 0;
 	ops = clk_dev_ops(clk->dev);
 
-	if (!ops->rfree)
+	if (!ops->free)
 		return 0;
 
-	return ops->rfree(clk);
+	return ops->free(clk);
 }
 
 ulong clk_get_rate(struct clk *clk)
diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index 768fbb7c52..7059979606 100644
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -108,7 +108,7 @@  static struct clk_ops sandbox_clk_ops = {
 	.enable		= sandbox_clk_enable,
 	.disable	= sandbox_clk_disable,
 	.request	= sandbox_clk_request,
-	.rfree		= sandbox_clk_free,
+	.free		= sandbox_clk_free,
 };
 
 static int sandbox_clk_probe(struct udevice *dev)
diff --git a/drivers/clk/tegra/tegra-car-clk.c b/drivers/clk/tegra/tegra-car-clk.c
index 6083f14e75..1f0e2dc95b 100644
--- a/drivers/clk/tegra/tegra-car-clk.c
+++ b/drivers/clk/tegra/tegra-car-clk.c
@@ -81,7 +81,7 @@  static int tegra_car_clk_disable(struct clk *clk)
 
 static struct clk_ops tegra_car_clk_ops = {
 	.request = tegra_car_clk_request,
-	.rfree = tegra_car_clk_free,
+	.free = tegra_car_clk_free,
 	.get_rate = tegra_car_clk_get_rate,
 	.set_rate = tegra_car_clk_set_rate,
 	.enable = tegra_car_clk_enable,
diff --git a/include/clk-uclass.h b/include/clk-uclass.h
index dac42dab36..e76d98e2f6 100644
--- a/include/clk-uclass.h
+++ b/include/clk-uclass.h
@@ -53,14 +53,14 @@  struct clk_ops {
 	 */
 	int (*request)(struct clk *clock);
 	/**
-	 * rfree - Free a previously requested clock.
+	 * free - Free a previously requested clock.
 	 *
 	 * This is the implementation of the client clk_free() API.
 	 *
 	 * @clock:	The clock to free.
 	 * @return 0 if OK, or a negative error code.
 	 */
-	int (*rfree)(struct clk *clock);
+	int (*free)(struct clk *clock);
 	/**
 	 * get_rate() - Get current clock rate.
 	 *