mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 07:31:15 +00:00
clk: Remove rfree
Nothing uses this function. Remove it. Since clk_free no longer does anything, just stub it out. Signed-off-by: Sean Anderson <seanga2@gmail.com> Link: https://lore.kernel.org/r/20231216193843.2463779-2-seanga2@gmail.com
This commit is contained in:
parent
b500447ad6
commit
82719d3f40
7 changed files with 4 additions and 79 deletions
|
@ -181,14 +181,6 @@ int sandbox_clk_test_disable(struct udevice *dev, int id);
|
||||||
* @return: 0 if OK, or a negative error code.
|
* @return: 0 if OK, or a negative error code.
|
||||||
*/
|
*/
|
||||||
int sandbox_clk_test_disable_bulk(struct udevice *dev);
|
int sandbox_clk_test_disable_bulk(struct udevice *dev);
|
||||||
/**
|
|
||||||
* sandbox_clk_test_free - Ask the sandbox clock test device to free its
|
|
||||||
* clocks.
|
|
||||||
*
|
|
||||||
* @dev: The sandbox clock test (client) device.
|
|
||||||
* @return: 0 if OK, or a negative error code.
|
|
||||||
*/
|
|
||||||
int sandbox_clk_test_free(struct udevice *dev);
|
|
||||||
/**
|
/**
|
||||||
* sandbox_clk_test_release_bulk - Ask the sandbox clock test device to release
|
* sandbox_clk_test_release_bulk - Ask the sandbox clock test device to release
|
||||||
* all clocks in it's clock bulk struct.
|
* all clocks in it's clock bulk struct.
|
||||||
|
|
|
@ -461,20 +461,6 @@ int clk_request(struct udevice *dev, struct clk *clk)
|
||||||
return ops->request(clk);
|
return ops->request(clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
void clk_free(struct clk *clk)
|
|
||||||
{
|
|
||||||
const struct clk_ops *ops;
|
|
||||||
|
|
||||||
debug("%s(clk=%p)\n", __func__, clk);
|
|
||||||
if (!clk_valid(clk))
|
|
||||||
return;
|
|
||||||
ops = clk_dev_ops(clk->dev);
|
|
||||||
|
|
||||||
if (ops->rfree)
|
|
||||||
ops->rfree(clk);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ulong clk_get_rate(struct clk *clk)
|
ulong clk_get_rate(struct clk *clk)
|
||||||
{
|
{
|
||||||
const struct clk_ops *ops;
|
const struct clk_ops *ops;
|
||||||
|
|
|
@ -101,17 +101,6 @@ static int sandbox_clk_request(struct clk *clk)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sandbox_clk_free(struct clk *clk)
|
|
||||||
{
|
|
||||||
struct sandbox_clk_priv *priv = dev_get_priv(clk->dev);
|
|
||||||
|
|
||||||
if (clk->id >= SANDBOX_CLK_ID_COUNT)
|
|
||||||
return;
|
|
||||||
|
|
||||||
priv->requested[clk->id] = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct clk_ops sandbox_clk_ops = {
|
static struct clk_ops sandbox_clk_ops = {
|
||||||
.round_rate = sandbox_clk_round_rate,
|
.round_rate = sandbox_clk_round_rate,
|
||||||
.get_rate = sandbox_clk_get_rate,
|
.get_rate = sandbox_clk_get_rate,
|
||||||
|
@ -119,7 +108,6 @@ 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,
|
||||||
.rfree = sandbox_clk_free,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int sandbox_clk_probe(struct udevice *dev)
|
static int sandbox_clk_probe(struct udevice *dev)
|
||||||
|
|
|
@ -135,18 +135,6 @@ int sandbox_clk_test_disable_bulk(struct udevice *dev)
|
||||||
return clk_disable_bulk(&sbct->bulk);
|
return clk_disable_bulk(&sbct->bulk);
|
||||||
}
|
}
|
||||||
|
|
||||||
int sandbox_clk_test_free(struct udevice *dev)
|
|
||||||
{
|
|
||||||
struct sandbox_clk_test *sbct = dev_get_priv(dev);
|
|
||||||
int i;
|
|
||||||
|
|
||||||
devm_clk_put(dev, sbct->clkps[SANDBOX_CLK_TEST_ID_DEVM1]);
|
|
||||||
for (i = 0; i < SANDBOX_CLK_TEST_NON_DEVM_COUNT; i++)
|
|
||||||
clk_free(&sbct->clks[i]);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int sandbox_clk_test_release_bulk(struct udevice *dev)
|
int sandbox_clk_test_release_bulk(struct udevice *dev)
|
||||||
{
|
{
|
||||||
struct sandbox_clk_test *sbct = dev_get_priv(dev);
|
struct sandbox_clk_test *sbct = dev_get_priv(dev);
|
||||||
|
|
|
@ -18,7 +18,6 @@ struct ofnode_phandle_args;
|
||||||
* struct clk_ops - The functions that a clock driver must implement.
|
* struct clk_ops - The functions that a clock driver must implement.
|
||||||
* @of_xlate: Translate a client's device-tree (OF) clock specifier.
|
* @of_xlate: Translate a client's device-tree (OF) clock specifier.
|
||||||
* @request: Request a translated clock.
|
* @request: Request a translated clock.
|
||||||
* @rfree: Free a previously requested clock.
|
|
||||||
* @round_rate: Adjust a rate to the exact rate a clock can provide.
|
* @round_rate: Adjust a rate to the exact rate a clock can provide.
|
||||||
* @get_rate: Get current clock rate.
|
* @get_rate: Get current clock rate.
|
||||||
* @set_rate: Set current clock rate.
|
* @set_rate: Set current clock rate.
|
||||||
|
@ -33,7 +32,6 @@ struct clk_ops {
|
||||||
int (*of_xlate)(struct clk *clock,
|
int (*of_xlate)(struct clk *clock,
|
||||||
struct ofnode_phandle_args *args);
|
struct ofnode_phandle_args *args);
|
||||||
int (*request)(struct clk *clock);
|
int (*request)(struct clk *clock);
|
||||||
void (*rfree)(struct clk *clock);
|
|
||||||
ulong (*round_rate)(struct clk *clk, ulong rate);
|
ulong (*round_rate)(struct clk *clk, ulong rate);
|
||||||
ulong (*get_rate)(struct clk *clk);
|
ulong (*get_rate)(struct clk *clk);
|
||||||
ulong (*set_rate)(struct clk *clk, ulong rate);
|
ulong (*set_rate)(struct clk *clk, ulong rate);
|
||||||
|
@ -81,14 +79,6 @@ int of_xlate(struct clk *clock, struct ofnode_phandle_args *args);
|
||||||
*/
|
*/
|
||||||
int request(struct clk *clock);
|
int request(struct clk *clock);
|
||||||
|
|
||||||
/**
|
|
||||||
* rfree() - Free a previously requested clock.
|
|
||||||
* @clock: The clock to free.
|
|
||||||
*
|
|
||||||
* Free any resources allocated in request().
|
|
||||||
*/
|
|
||||||
void rfree(struct clk *clock);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* round_rate() - Adjust a rate to the exact rate a clock can provide.
|
* round_rate() - Adjust a rate to the exact rate a clock can provide.
|
||||||
* @clk: The clock to manipulate.
|
* @clk: The clock to manipulate.
|
||||||
|
|
|
@ -424,6 +424,10 @@ static inline int clk_release_bulk(struct clk_bulk *bulk)
|
||||||
return clk_release_all(bulk->clks, bulk->count);
|
return clk_release_all(bulk->clks, bulk->count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void clk_free(struct clk *clk)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
#if CONFIG_IS_ENABLED(CLK)
|
#if CONFIG_IS_ENABLED(CLK)
|
||||||
/**
|
/**
|
||||||
* clk_request() - Request a clock by provider-specific ID.
|
* clk_request() - Request a clock by provider-specific ID.
|
||||||
|
@ -441,15 +445,6 @@ static inline int clk_release_bulk(struct clk_bulk *bulk)
|
||||||
*/
|
*/
|
||||||
int clk_request(struct udevice *dev, struct clk *clk);
|
int clk_request(struct udevice *dev, struct clk *clk);
|
||||||
|
|
||||||
/**
|
|
||||||
* clk_free() - Free a previously requested clock.
|
|
||||||
* @clk: A clock struct that was previously successfully requested by
|
|
||||||
* clk_request/get_by_*().
|
|
||||||
*
|
|
||||||
* Free resources allocated by clk_request() (or any clk_get_* function).
|
|
||||||
*/
|
|
||||||
void clk_free(struct clk *clk);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* clk_get_rate() - Get current clock rate.
|
* clk_get_rate() - Get current clock rate.
|
||||||
* @clk: A clock struct that was previously successfully requested by
|
* @clk: A clock struct that was previously successfully requested by
|
||||||
|
@ -594,11 +589,6 @@ static inline int clk_request(struct udevice *dev, struct clk *clk)
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void clk_free(struct clk *clk)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline ulong clk_get_rate(struct clk *clk)
|
static inline ulong clk_get_rate(struct clk *clk)
|
||||||
{
|
{
|
||||||
return -ENOSYS;
|
return -ENOSYS;
|
||||||
|
|
|
@ -182,19 +182,10 @@ static int dm_test_clk(struct unit_test_state *uts)
|
||||||
SANDBOX_CLK_ID_I2C));
|
SANDBOX_CLK_ID_I2C));
|
||||||
ut_asserteq(1, sandbox_clk_query_requested(dev_clk,
|
ut_asserteq(1, sandbox_clk_query_requested(dev_clk,
|
||||||
SANDBOX_CLK_ID_UART2));
|
SANDBOX_CLK_ID_UART2));
|
||||||
ut_assertok(sandbox_clk_test_free(dev_test));
|
|
||||||
ut_asserteq(0, sandbox_clk_query_requested(dev_clk,
|
|
||||||
SANDBOX_CLK_ID_SPI));
|
|
||||||
ut_asserteq(0, sandbox_clk_query_requested(dev_clk,
|
|
||||||
SANDBOX_CLK_ID_I2C));
|
|
||||||
ut_asserteq(0, sandbox_clk_query_requested(dev_clk,
|
|
||||||
SANDBOX_CLK_ID_UART2));
|
|
||||||
|
|
||||||
ut_asserteq(1, sandbox_clk_query_requested(dev_clk,
|
ut_asserteq(1, sandbox_clk_query_requested(dev_clk,
|
||||||
SANDBOX_CLK_ID_UART1));
|
SANDBOX_CLK_ID_UART1));
|
||||||
ut_assertok(device_remove(dev_test, DM_REMOVE_NORMAL));
|
ut_assertok(device_remove(dev_test, DM_REMOVE_NORMAL));
|
||||||
ut_asserteq(0, sandbox_clk_query_requested(dev_clk,
|
|
||||||
SANDBOX_CLK_ID_UART1));
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
DM_TEST(dm_test_clk, UT_TESTF_SCAN_FDT);
|
DM_TEST(dm_test_clk, UT_TESTF_SCAN_FDT);
|
||||||
|
|
Loading…
Reference in a new issue