clk: Rename free() to rfree()

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>

diff --git a/drivers/clk/clk-ti-sci.c b/drivers/clk/clk-ti-sci.c
index ed1facbbcd7063c17371d5e73a0117edfc128137..8212435ba81c626aeb3ee84f3a81757edf1d23aa 100644 (file)
--- a/drivers/clk/clk-ti-sci.c
+++ b/drivers/clk/clk-ti-sci.c
@@ -203,7 +203,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,
-       .free = ti_sci_clk_free,
+       .rfree = 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 0df38bd06a497e22cc3a68250dd219b00ee8d3c3..49fa60eb7c6666064ba14c831b14805efe5dbad9 100644 (file)
--- a/drivers/clk/clk-uclass.c
+++ b/drivers/clk/clk-uclass.c
@@ -423,10 +423,10 @@ int clk_free(struct clk *clk)
                return 0;
        ops = clk_dev_ops(clk->dev);
 
-       if (!ops->free)
+       if (!ops->rfree)
                return 0;
 
-       return ops->free(clk);
+       return ops->rfree(clk);
 }
 
 ulong clk_get_rate(struct clk *clk)

diff --git a/drivers/clk/clk_sandbox.c b/drivers/clk/clk_sandbox.c
index de6b2f7c82f29f4604a455214e734b961152a428..cc084b0644cf95db529a130d5366ed86759585d5 100644 (file)
--- a/drivers/clk/clk_sandbox.c
+++ b/drivers/clk/clk_sandbox.c
@@ -107,7 +107,7 @@ static struct clk_ops sandbox_clk_ops = {
        .enable         = sandbox_clk_enable,
        .disable        = sandbox_clk_disable,
        .request        = sandbox_clk_request,
-       .free           = sandbox_clk_free,
+       .rfree          = 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 98be7602b3d666c9d290c7da072a6998fec9a599..07e8734b3a69c75e8481e23b1f6414d0e04692e1 100644 (file)
--- a/drivers/clk/tegra/tegra-car-clk.c
+++ b/drivers/clk/tegra/tegra-car-clk.c
@@ -80,7 +80,7 @@ static int tegra_car_clk_disable(struct clk *clk)
 
 static struct clk_ops tegra_car_clk_ops = {
        .request = tegra_car_clk_request,
-       .free = tegra_car_clk_free,
+       .rfree = 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 e76d98e2f6751611de309f7c2764d852c08e67d3..dac42dab3681287bbe777a2effea7a25f5a1dfbf 100644 (file)
--- a/include/clk-uclass.h
+++ b/include/clk-uclass.h
@@ -53,14 +53,14 @@ struct clk_ops {
         */
        int (*request)(struct clk *clock);
        /**
-        * free - Free a previously requested clock.
+        * rfree - 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 (*free)(struct clk *clock);
+       int (*rfree)(struct clk *clock);
        /**
         * get_rate() - Get current clock rate.
         *