power-domain: 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>
Reviewed-by: Anatolij Gustschin <agust@denx.de>

diff --git a/drivers/power/domain/bcm6328-power-domain.c b/drivers/power/domain/bcm6328-power-domain.c
index a90b2c83df8498a55f0ba93007f2b5863c52975e..425451e4cd698443f418a7f50f7b2f9b7b3c6afb 100644 (file)
--- a/drivers/power/domain/bcm6328-power-domain.c
+++ b/drivers/power/domain/bcm6328-power-domain.c
@@ -62,7 +62,7 @@ static const struct udevice_id bcm6328_power_domain_ids[] = {
 };
 
 struct power_domain_ops bcm6328_power_domain_ops = {
-       .free = bcm6328_power_domain_free,
+       .rfree = bcm6328_power_domain_free,
        .off = bcm6328_power_domain_off,
        .on = bcm6328_power_domain_on,
        .request = bcm6328_power_domain_request,

diff --git a/drivers/power/domain/imx8-power-domain-legacy.c b/drivers/power/domain/imx8-power-domain-legacy.c
index d51dbaa6c07b242336089533fd700602a2c8f708..74fcb05c15b8fd3c5efec089f5a66aca07a5ab85 100644 (file)
--- a/drivers/power/domain/imx8-power-domain-legacy.c
+++ b/drivers/power/domain/imx8-power-domain-legacy.c
@@ -296,7 +296,7 @@ static const struct udevice_id imx8_power_domain_ids[] = {
 
 struct power_domain_ops imx8_power_domain_ops = {
        .request = imx8_power_domain_request,
-       .free = imx8_power_domain_free,
+       .rfree = imx8_power_domain_free,
        .on = imx8_power_domain_on,
        .off = imx8_power_domain_off,
        .of_xlate = imx8_power_domain_of_xlate,

diff --git a/drivers/power/domain/imx8-power-domain.c b/drivers/power/domain/imx8-power-domain.c
index aa768365b47eccba757cd00a994616d10d168b91..8e328f02c2ca24887a6941925cbe4c45bb6812b5 100644 (file)
--- a/drivers/power/domain/imx8-power-domain.c
+++ b/drivers/power/domain/imx8-power-domain.c
@@ -73,7 +73,7 @@ static const struct udevice_id imx8_power_domain_ids[] = {
 
 struct power_domain_ops imx8_power_domain_ops_v2 = {
        .request = imx8_power_domain_request,
-       .free = imx8_power_domain_free,
+       .rfree = imx8_power_domain_free,
        .on = imx8_power_domain_on,
        .off = imx8_power_domain_off,
 };

diff --git a/drivers/power/domain/imx8m-power-domain.c b/drivers/power/domain/imx8m-power-domain.c
index 40ece9ee3fa7e6c645e6820e3eed261420bdd4f1..fbfd17718bcdf7606c277cdf2ef11358f79bdb7c 100644 (file)
--- a/drivers/power/domain/imx8m-power-domain.c
+++ b/drivers/power/domain/imx8m-power-domain.c
@@ -121,7 +121,7 @@ static const struct udevice_id imx8m_power_domain_ids[] = {
 
 struct power_domain_ops imx8m_power_domain_ops = {
        .request = imx8m_power_domain_request,
-       .free = imx8m_power_domain_free,
+       .rfree = imx8m_power_domain_free,
        .on = imx8m_power_domain_on,
        .off = imx8m_power_domain_off,
        .of_xlate = imx8m_power_domain_of_xlate,

diff --git a/drivers/power/domain/meson-ee-pwrc.c b/drivers/power/domain/meson-ee-pwrc.c
index 21d4c9d4dd91779ff8684407b2d2aa8539e9305a..7f5d13e8725bf0a28406f9146d647234bb85eac7 100644 (file)
--- a/drivers/power/domain/meson-ee-pwrc.c
+++ b/drivers/power/domain/meson-ee-pwrc.c
@@ -352,7 +352,7 @@ static int meson_ee_pwrc_of_xlate(struct power_domain *power_domain,
 }
 
 struct power_domain_ops meson_ee_pwrc_ops = {
-       .free = meson_ee_pwrc_free,
+       .rfree = meson_ee_pwrc_free,
        .off = meson_ee_pwrc_off,
        .on = meson_ee_pwrc_on,
        .request = meson_ee_pwrc_request,

diff --git a/drivers/power/domain/meson-gx-pwrc-vpu.c b/drivers/power/domain/meson-gx-pwrc-vpu.c
index f44e33bacb25e3ff98eca5d469fbe7dc49a676fa..bd69aea8ddd23104aabf4ef8b9d3054c6a27d62d 100644 (file)
--- a/drivers/power/domain/meson-gx-pwrc-vpu.c
+++ b/drivers/power/domain/meson-gx-pwrc-vpu.c
@@ -269,7 +269,7 @@ static int meson_pwrc_vpu_of_xlate(struct power_domain *power_domain,
 }
 
 struct power_domain_ops meson_gx_pwrc_vpu_ops = {
-       .free = meson_pwrc_vpu_free,
+       .rfree = meson_pwrc_vpu_free,
        .off = meson_pwrc_vpu_off,
        .on = meson_pwrc_vpu_on,
        .request = meson_pwrc_vpu_request,

diff --git a/drivers/power/domain/mtk-power-domain.c b/drivers/power/domain/mtk-power-domain.c
index 0bf8a16447ba257ddb137e3aa6e465eecf4cd011..6ea4fe90038da985046de0413cf73cf8eb807314 100644 (file)
--- a/drivers/power/domain/mtk-power-domain.c
+++ b/drivers/power/domain/mtk-power-domain.c
@@ -396,7 +396,7 @@ static const struct udevice_id mtk_power_domain_ids[] = {
 };
 
 struct power_domain_ops mtk_power_domain_ops = {
-       .free = scpsys_power_free,
+       .rfree = scpsys_power_free,
        .off = scpsys_power_off,
        .on = scpsys_power_on,
        .request = scpsys_power_request,

diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c
index 80df5aff5018b1280e5e1c3ffacd1aacd99a4b3f..be0a8026f6971ae56041f88bf1e9ef36b2ec03da 100644 (file)
--- a/drivers/power/domain/power-domain-uclass.c
+++ b/drivers/power/domain/power-domain-uclass.c
@@ -87,7 +87,7 @@ int power_domain_free(struct power_domain *power_domain)
 
        debug("%s(power_domain=%p)\n", __func__, power_domain);
 
-       return ops->free(power_domain);
+       return ops->rfree(power_domain);
 }
 
 int power_domain_on(struct power_domain *power_domain)

diff --git a/drivers/power/domain/sandbox-power-domain.c b/drivers/power/domain/sandbox-power-domain.c
index 74db2eba7e23cd3cadc9ade0f4c5987ba25fb8ed..a5ae235d539f098b801a60242f46475ec2306e54 100644 (file)
--- a/drivers/power/domain/sandbox-power-domain.c
+++ b/drivers/power/domain/sandbox-power-domain.c
@@ -75,7 +75,7 @@ static const struct udevice_id sandbox_power_domain_ids[] = {
 
 struct power_domain_ops sandbox_power_domain_ops = {
        .request = sandbox_power_domain_request,
-       .free = sandbox_power_domain_free,
+       .rfree = sandbox_power_domain_free,
        .on = sandbox_power_domain_on,
        .off = sandbox_power_domain_off,
 };

diff --git a/drivers/power/domain/tegra186-power-domain.c b/drivers/power/domain/tegra186-power-domain.c
index f3445582272818776da93ae958d3e395f2ef5544..d2a25ca33339dc39a44cb52ab7b01d39a4ece2ed 100644 (file)
--- a/drivers/power/domain/tegra186-power-domain.c
+++ b/drivers/power/domain/tegra186-power-domain.c
@@ -71,7 +71,7 @@ static int tegra186_power_domain_off(struct power_domain *power_domain)
 
 struct power_domain_ops tegra186_power_domain_ops = {
        .request = tegra186_power_domain_request,
-       .free = tegra186_power_domain_free,
+       .rfree = tegra186_power_domain_free,
        .on = tegra186_power_domain_on,
        .off = tegra186_power_domain_off,
 };

diff --git a/drivers/power/domain/ti-sci-power-domain.c b/drivers/power/domain/ti-sci-power-domain.c
index 4c4351d2d9982909c62963f483b556acf823d424..b59af2b13b6b70d63cc6d752332761a43af0e50a 100644 (file)
--- a/drivers/power/domain/ti-sci-power-domain.c
+++ b/drivers/power/domain/ti-sci-power-domain.c
@@ -120,7 +120,7 @@ static const struct udevice_id ti_sci_power_domain_of_match[] = {
 
 static struct power_domain_ops ti_sci_power_domain_ops = {
        .request = ti_sci_power_domain_request,
-       .free = ti_sci_power_domain_free,
+       .rfree = ti_sci_power_domain_free,
        .on = ti_sci_power_domain_on,
        .off = ti_sci_power_domain_off,
        .of_xlate = ti_sci_power_domain_of_xlate,

diff --git a/include/power-domain-uclass.h b/include/power-domain-uclass.h
index bd9906b2e7bb8fddd9568a2103bf11b1c045e0b3..acf749b38edfca39f537264f684473fe276915bb 100644 (file)
--- a/include/power-domain-uclass.h
+++ b/include/power-domain-uclass.h
@@ -54,14 +54,14 @@ struct power_domain_ops {
         */
        int (*request)(struct power_domain *power_domain);
        /**
-        * free - Free a previously requested power domain.
+        * rfree - Free a previously requested power domain.
         *
         * This is the implementation of the client power_domain_free() API.
         *
         * @power_domain:       The power domain to free.
         * @return 0 if OK, or a negative error code.
         */
-       int (*free)(struct power_domain *power_domain);
+       int (*rfree)(struct power_domain *power_domain);
        /**
         * on - Power on a power domain.
         *