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>
This commit is contained in:
Simon Glass 2020-02-03 07:35:51 -07:00
parent cc92c3cc68
commit 4f51188e47
12 changed files with 13 additions and 13 deletions

View file

@ -62,7 +62,7 @@ static const struct udevice_id bcm6328_power_domain_ids[] = {
}; };
struct power_domain_ops bcm6328_power_domain_ops = { struct power_domain_ops bcm6328_power_domain_ops = {
.free = bcm6328_power_domain_free, .rfree = bcm6328_power_domain_free,
.off = bcm6328_power_domain_off, .off = bcm6328_power_domain_off,
.on = bcm6328_power_domain_on, .on = bcm6328_power_domain_on,
.request = bcm6328_power_domain_request, .request = bcm6328_power_domain_request,

View file

@ -296,7 +296,7 @@ static const struct udevice_id imx8_power_domain_ids[] = {
struct power_domain_ops imx8_power_domain_ops = { struct power_domain_ops imx8_power_domain_ops = {
.request = imx8_power_domain_request, .request = imx8_power_domain_request,
.free = imx8_power_domain_free, .rfree = imx8_power_domain_free,
.on = imx8_power_domain_on, .on = imx8_power_domain_on,
.off = imx8_power_domain_off, .off = imx8_power_domain_off,
.of_xlate = imx8_power_domain_of_xlate, .of_xlate = imx8_power_domain_of_xlate,

View file

@ -73,7 +73,7 @@ static const struct udevice_id imx8_power_domain_ids[] = {
struct power_domain_ops imx8_power_domain_ops_v2 = { struct power_domain_ops imx8_power_domain_ops_v2 = {
.request = imx8_power_domain_request, .request = imx8_power_domain_request,
.free = imx8_power_domain_free, .rfree = imx8_power_domain_free,
.on = imx8_power_domain_on, .on = imx8_power_domain_on,
.off = imx8_power_domain_off, .off = imx8_power_domain_off,
}; };

View file

@ -121,7 +121,7 @@ static const struct udevice_id imx8m_power_domain_ids[] = {
struct power_domain_ops imx8m_power_domain_ops = { struct power_domain_ops imx8m_power_domain_ops = {
.request = imx8m_power_domain_request, .request = imx8m_power_domain_request,
.free = imx8m_power_domain_free, .rfree = imx8m_power_domain_free,
.on = imx8m_power_domain_on, .on = imx8m_power_domain_on,
.off = imx8m_power_domain_off, .off = imx8m_power_domain_off,
.of_xlate = imx8m_power_domain_of_xlate, .of_xlate = imx8m_power_domain_of_xlate,

View file

@ -352,7 +352,7 @@ static int meson_ee_pwrc_of_xlate(struct power_domain *power_domain,
} }
struct power_domain_ops meson_ee_pwrc_ops = { struct power_domain_ops meson_ee_pwrc_ops = {
.free = meson_ee_pwrc_free, .rfree = meson_ee_pwrc_free,
.off = meson_ee_pwrc_off, .off = meson_ee_pwrc_off,
.on = meson_ee_pwrc_on, .on = meson_ee_pwrc_on,
.request = meson_ee_pwrc_request, .request = meson_ee_pwrc_request,

View file

@ -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 = { struct power_domain_ops meson_gx_pwrc_vpu_ops = {
.free = meson_pwrc_vpu_free, .rfree = meson_pwrc_vpu_free,
.off = meson_pwrc_vpu_off, .off = meson_pwrc_vpu_off,
.on = meson_pwrc_vpu_on, .on = meson_pwrc_vpu_on,
.request = meson_pwrc_vpu_request, .request = meson_pwrc_vpu_request,

View file

@ -396,7 +396,7 @@ static const struct udevice_id mtk_power_domain_ids[] = {
}; };
struct power_domain_ops mtk_power_domain_ops = { struct power_domain_ops mtk_power_domain_ops = {
.free = scpsys_power_free, .rfree = scpsys_power_free,
.off = scpsys_power_off, .off = scpsys_power_off,
.on = scpsys_power_on, .on = scpsys_power_on,
.request = scpsys_power_request, .request = scpsys_power_request,

View file

@ -87,7 +87,7 @@ int power_domain_free(struct power_domain *power_domain)
debug("%s(power_domain=%p)\n", __func__, 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) int power_domain_on(struct power_domain *power_domain)

View file

@ -75,7 +75,7 @@ static const struct udevice_id sandbox_power_domain_ids[] = {
struct power_domain_ops sandbox_power_domain_ops = { struct power_domain_ops sandbox_power_domain_ops = {
.request = sandbox_power_domain_request, .request = sandbox_power_domain_request,
.free = sandbox_power_domain_free, .rfree = sandbox_power_domain_free,
.on = sandbox_power_domain_on, .on = sandbox_power_domain_on,
.off = sandbox_power_domain_off, .off = sandbox_power_domain_off,
}; };

View file

@ -71,7 +71,7 @@ static int tegra186_power_domain_off(struct power_domain *power_domain)
struct power_domain_ops tegra186_power_domain_ops = { struct power_domain_ops tegra186_power_domain_ops = {
.request = tegra186_power_domain_request, .request = tegra186_power_domain_request,
.free = tegra186_power_domain_free, .rfree = tegra186_power_domain_free,
.on = tegra186_power_domain_on, .on = tegra186_power_domain_on,
.off = tegra186_power_domain_off, .off = tegra186_power_domain_off,
}; };

View file

@ -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 = { static struct power_domain_ops ti_sci_power_domain_ops = {
.request = ti_sci_power_domain_request, .request = ti_sci_power_domain_request,
.free = ti_sci_power_domain_free, .rfree = ti_sci_power_domain_free,
.on = ti_sci_power_domain_on, .on = ti_sci_power_domain_on,
.off = ti_sci_power_domain_off, .off = ti_sci_power_domain_off,
.of_xlate = ti_sci_power_domain_of_xlate, .of_xlate = ti_sci_power_domain_of_xlate,

View file

@ -54,14 +54,14 @@ struct power_domain_ops {
*/ */
int (*request)(struct power_domain *power_domain); 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. * This is the implementation of the client power_domain_free() API.
* *
* @power_domain: The power domain to free. * @power_domain: The power domain to free.
* @return 0 if OK, or a negative error code. * @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. * on - Power on a power domain.
* *