mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
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>
This commit is contained in:
parent
093152f275
commit
fb8c0d595f
|
@ -203,7 +203,7 @@ static const struct udevice_id ti_sci_clk_of_match[] = {
|
||||||
static struct clk_ops ti_sci_clk_ops = {
|
static struct clk_ops ti_sci_clk_ops = {
|
||||||
.of_xlate = ti_sci_clk_of_xlate,
|
.of_xlate = ti_sci_clk_of_xlate,
|
||||||
.request = ti_sci_clk_request,
|
.request = ti_sci_clk_request,
|
||||||
.free = ti_sci_clk_free,
|
.rfree = ti_sci_clk_free,
|
||||||
.get_rate = ti_sci_clk_get_rate,
|
.get_rate = ti_sci_clk_get_rate,
|
||||||
.set_rate = ti_sci_clk_set_rate,
|
.set_rate = ti_sci_clk_set_rate,
|
||||||
.set_parent = ti_sci_clk_set_parent,
|
.set_parent = ti_sci_clk_set_parent,
|
||||||
|
|
|
@ -423,10 +423,10 @@ int clk_free(struct clk *clk)
|
||||||
return 0;
|
return 0;
|
||||||
ops = clk_dev_ops(clk->dev);
|
ops = clk_dev_ops(clk->dev);
|
||||||
|
|
||||||
if (!ops->free)
|
if (!ops->rfree)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
return ops->free(clk);
|
return ops->rfree(clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
ulong clk_get_rate(struct clk *clk)
|
ulong clk_get_rate(struct clk *clk)
|
||||||
|
|
|
@ -107,7 +107,7 @@ static struct clk_ops sandbox_clk_ops = {
|
||||||
.enable = sandbox_clk_enable,
|
.enable = sandbox_clk_enable,
|
||||||
.disable = sandbox_clk_disable,
|
.disable = sandbox_clk_disable,
|
||||||
.request = sandbox_clk_request,
|
.request = sandbox_clk_request,
|
||||||
.free = sandbox_clk_free,
|
.rfree = sandbox_clk_free,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int sandbox_clk_probe(struct udevice *dev)
|
static int sandbox_clk_probe(struct udevice *dev)
|
||||||
|
|
|
@ -80,7 +80,7 @@ static int tegra_car_clk_disable(struct clk *clk)
|
||||||
|
|
||||||
static struct clk_ops tegra_car_clk_ops = {
|
static struct clk_ops tegra_car_clk_ops = {
|
||||||
.request = tegra_car_clk_request,
|
.request = tegra_car_clk_request,
|
||||||
.free = tegra_car_clk_free,
|
.rfree = tegra_car_clk_free,
|
||||||
.get_rate = tegra_car_clk_get_rate,
|
.get_rate = tegra_car_clk_get_rate,
|
||||||
.set_rate = tegra_car_clk_set_rate,
|
.set_rate = tegra_car_clk_set_rate,
|
||||||
.enable = tegra_car_clk_enable,
|
.enable = tegra_car_clk_enable,
|
||||||
|
|
|
@ -53,14 +53,14 @@ struct clk_ops {
|
||||||
*/
|
*/
|
||||||
int (*request)(struct clk *clock);
|
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.
|
* This is the implementation of the client clk_free() API.
|
||||||
*
|
*
|
||||||
* @clock: The clock to free.
|
* @clock: The clock to free.
|
||||||
* @return 0 if OK, or a negative error code.
|
* @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.
|
* get_rate() - Get current clock rate.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue
Block a user