reset: 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/reset/reset-bcm6345.c b/drivers/reset/reset-bcm6345.c
index 753c110..bbaaea9 100644 (file)
--- a/drivers/reset/reset-bcm6345.c
+++ b/drivers/reset/reset-bcm6345.c
@@ -52,7 +52,7 @@ static int bcm6345_reset_request(struct reset_ctl *rst)
 }
 
 struct reset_ops bcm6345_reset_reset_ops = {
-       .free = bcm6345_reset_free,
+       .rfree = bcm6345_reset_free,
        .request = bcm6345_reset_request,
        .rst_assert = bcm6345_reset_assert,
        .rst_deassert = bcm6345_reset_deassert,

diff --git a/drivers/reset/reset-hisilicon.c b/drivers/reset/reset-hisilicon.c
index a9f052a..d449e3d 100644 (file)
--- a/drivers/reset/reset-hisilicon.c
+++ b/drivers/reset/reset-hisilicon.c
@@ -72,7 +72,7 @@ static int hisi_reset_of_xlate(struct reset_ctl *rst,
 static const struct reset_ops hisi_reset_reset_ops = {
        .of_xlate = hisi_reset_of_xlate,
        .request = hisi_reset_request,
-       .free = hisi_reset_free,
+       .rfree = hisi_reset_free,
        .rst_assert = hisi_reset_assert,
        .rst_deassert = hisi_reset_deassert,
 };

diff --git a/drivers/reset/reset-hsdk.c b/drivers/reset/reset-hsdk.c
index 213d6c8..f9a432a 100644 (file)
--- a/drivers/reset/reset-hsdk.c
+++ b/drivers/reset/reset-hsdk.c
@@ -81,7 +81,7 @@ static int hsdk_reset_noop(struct reset_ctl *rst_ctl)
 
 static const struct reset_ops hsdk_reset_ops = {
        .request        = hsdk_reset_noop,
-       .free           = hsdk_reset_noop,
+       .rfree          = hsdk_reset_noop,
        .rst_assert     = hsdk_reset_noop,
        .rst_deassert   = hsdk_reset_reset,
 };

diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index f2ca5cf..a2bad65 100644 (file)
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -272,7 +272,7 @@ static int imx7_reset_request(struct reset_ctl *rst)
 
 static const struct reset_ops imx7_reset_reset_ops = {
        .request = imx7_reset_request,
-       .free = imx7_reset_free,
+       .rfree = imx7_reset_free,
        .rst_assert = imx7_reset_assert,
        .rst_deassert = imx7_reset_deassert,
 };

diff --git a/drivers/reset/reset-mediatek.c b/drivers/reset/reset-mediatek.c
index e3614e6..cfbf2af 100644 (file)
--- a/drivers/reset/reset-mediatek.c
+++ b/drivers/reset/reset-mediatek.c
@@ -55,7 +55,7 @@ static int mediatek_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops mediatek_reset_ops = {
        .request = mediatek_reset_request,
-       .free = mediatek_reset_free,
+       .rfree = mediatek_reset_free,
        .rst_assert = mediatek_reset_assert,
        .rst_deassert = mediatek_reset_deassert,
 };

diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index 31aa4d4..9026e03 100644 (file)
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -62,7 +62,7 @@ static int meson_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops meson_reset_ops = {
        .request = meson_reset_request,
-       .free = meson_reset_free,
+       .rfree = meson_reset_free,
        .rst_assert = meson_reset_assert,
        .rst_deassert = meson_reset_deassert,
 };

diff --git a/drivers/reset/reset-mtmips.c b/drivers/reset/reset-mtmips.c
index 5973456..71254a9 100644 (file)
--- a/drivers/reset/reset-mtmips.c
+++ b/drivers/reset/reset-mtmips.c
@@ -45,7 +45,7 @@ static int mtmips_reset_deassert(struct reset_ctl *reset_ctl)
 
 static const struct reset_ops mtmips_reset_ops = {
        .request        = mtmips_reset_request,
-       .free           = mtmips_reset_free,
+       .rfree          = mtmips_reset_free,
        .rst_assert     = mtmips_reset_assert,
        .rst_deassert   = mtmips_reset_deassert,
 };

diff --git a/drivers/reset/reset-rockchip.c b/drivers/reset/reset-rockchip.c
index 3871fc0..4fb9571 100644 (file)
--- a/drivers/reset/reset-rockchip.c
+++ b/drivers/reset/reset-rockchip.c
@@ -76,7 +76,7 @@ static int rockchip_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops rockchip_reset_ops = {
        .request = rockchip_reset_request,
-       .free = rockchip_reset_free,
+       .rfree = rockchip_reset_free,
        .rst_assert = rockchip_reset_assert,
        .rst_deassert = rockchip_reset_deassert,
 };

diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
index 93ec9cf..98524eb 100644 (file)
--- a/drivers/reset/reset-socfpga.c
+++ b/drivers/reset/reset-socfpga.c
@@ -101,7 +101,7 @@ static int socfpga_reset_free(struct reset_ctl *reset_ctl)
 
 static const struct reset_ops socfpga_reset_ops = {
        .request = socfpga_reset_request,
-       .free = socfpga_reset_free,
+       .rfree = socfpga_reset_free,
        .rst_assert = socfpga_reset_assert,
        .rst_deassert = socfpga_reset_deassert,
 };

diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
index 364dc52..1c717b2 100644 (file)
--- a/drivers/reset/reset-sunxi.c
+++ b/drivers/reset/reset-sunxi.c
@@ -81,7 +81,7 @@ static int sunxi_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops sunxi_reset_ops = {
        .request = sunxi_reset_request,
-       .free = sunxi_reset_free,
+       .rfree = sunxi_reset_free,
        .rst_assert = sunxi_reset_assert,
        .rst_deassert = sunxi_reset_deassert,
 };

diff --git a/drivers/reset/reset-ti-sci.c b/drivers/reset/reset-ti-sci.c
index c8a76df..7b6f736 100644 (file)
--- a/drivers/reset/reset-ti-sci.c
+++ b/drivers/reset/reset-ti-sci.c
@@ -190,7 +190,7 @@ static const struct udevice_id ti_sci_reset_of_match[] = {
 static struct reset_ops ti_sci_reset_ops = {
        .of_xlate = ti_sci_reset_of_xlate,
        .request = ti_sci_reset_request,
-       .free = ti_sci_reset_free,
+       .rfree = ti_sci_reset_free,
        .rst_assert = ti_sci_reset_assert,
        .rst_deassert = ti_sci_reset_deassert,
        .rst_status = ti_sci_reset_status,

diff --git a/drivers/reset/reset-uclass.c b/drivers/reset/reset-uclass.c
index ee1a423..bf1cba4 100644 (file)
--- a/drivers/reset/reset-uclass.c
+++ b/drivers/reset/reset-uclass.c
@@ -164,7 +164,7 @@ int reset_free(struct reset_ctl *reset_ctl)
 
        debug("%s(reset_ctl=%p)\n", __func__, reset_ctl);
 
-       return ops->free(reset_ctl);
+       return ops->rfree(reset_ctl);
 }
 
 int reset_assert(struct reset_ctl *reset_ctl)

diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 39d684b..97f7b0e 100644 (file)
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -234,7 +234,7 @@ static int uniphier_reset_deassert(struct reset_ctl *reset_ctl)
 
 static const struct reset_ops uniphier_reset_ops = {
        .request = uniphier_reset_request,
-       .free = uniphier_reset_free,
+       .rfree = uniphier_reset_free,
        .rst_assert = uniphier_reset_assert,
        .rst_deassert = uniphier_reset_deassert,
 };

diff --git a/drivers/reset/sandbox-reset.c b/drivers/reset/sandbox-reset.c
index 40f2654..c03fce3 100644 (file)
--- a/drivers/reset/sandbox-reset.c
+++ b/drivers/reset/sandbox-reset.c
@@ -79,7 +79,7 @@ static const struct udevice_id sandbox_reset_ids[] = {
 
 struct reset_ops sandbox_reset_reset_ops = {
        .request = sandbox_reset_request,
-       .free = sandbox_reset_free,
+       .rfree = sandbox_reset_free,
        .rst_assert = sandbox_reset_assert,
        .rst_deassert = sandbox_reset_deassert,
 };

diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c
index d8cc485..614da9d 100644 (file)
--- a/drivers/reset/sti-reset.c
+++ b/drivers/reset/sti-reset.c
@@ -298,7 +298,7 @@ static int sti_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops sti_reset_ops = {
        .request = sti_reset_request,
-       .free = sti_reset_free,
+       .rfree = sti_reset_free,
        .rst_assert = sti_reset_assert,
        .rst_deassert = sti_reset_deassert,
 };

diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c
index 16d3dba..4d7745a 100644 (file)
--- a/drivers/reset/stm32-reset.c
+++ b/drivers/reset/stm32-reset.c
@@ -64,7 +64,7 @@ static int stm32_reset_deassert(struct reset_ctl *reset_ctl)
 
 static const struct reset_ops stm32_reset_ops = {
        .request        = stm32_reset_request,
-       .free           = stm32_reset_free,
+       .rfree          = stm32_reset_free,
        .rst_assert     = stm32_reset_assert,
        .rst_deassert   = stm32_reset_deassert,
 };

diff --git a/drivers/reset/tegra-car-reset.c b/drivers/reset/tegra-car-reset.c
index 2594782..886ea04 100644 (file)
--- a/drivers/reset/tegra-car-reset.c
+++ b/drivers/reset/tegra-car-reset.c
@@ -51,7 +51,7 @@ static int tegra_car_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops tegra_car_reset_ops = {
        .request = tegra_car_reset_request,
-       .free = tegra_car_reset_free,
+       .rfree = tegra_car_reset_free,
        .rst_assert = tegra_car_reset_assert,
        .rst_deassert = tegra_car_reset_deassert,
 };

diff --git a/drivers/reset/tegra186-reset.c b/drivers/reset/tegra186-reset.c
index 9927c06..84ed77b 100644 (file)
--- a/drivers/reset/tegra186-reset.c
+++ b/drivers/reset/tegra186-reset.c
@@ -60,7 +60,7 @@ static int tegra186_reset_deassert(struct reset_ctl *reset_ctl)
 
 struct reset_ops tegra186_reset_ops = {
        .request = tegra186_reset_request,
-       .free = tegra186_reset_free,
+       .rfree = tegra186_reset_free,
        .rst_assert = tegra186_reset_assert,
        .rst_deassert = tegra186_reset_deassert,
 };

diff --git a/include/reset-uclass.h b/include/reset-uclass.h
index 7b5cc3c..9a0696d 100644 (file)
--- a/include/reset-uclass.h
+++ b/include/reset-uclass.h
@@ -51,14 +51,14 @@ struct reset_ops {
         */
        int (*request)(struct reset_ctl *reset_ctl);
        /**
-        * free - Free a previously requested reset control.
+        * rfree - Free a previously requested reset control.
         *
         * This is the implementation of the client reset_free() API.
         *
         * @reset_ctl:  The reset control to free.
         * @return 0 if OK, or a negative error code.
         */
-       int (*free)(struct reset_ctl *reset_ctl);
+       int (*rfree)(struct reset_ctl *reset_ctl);
        /**
         * rst_assert - Assert a reset signal.
         *