Message ID | 20250224010610.187503-1-linux@treblig.org |
---|---|
State | New |
Headers | show |
Series | PM: clk: remove unused of_pm_clk_add_clk | expand |
On Mon, Feb 24, 2025 at 2:06 AM <linux@treblig.org> wrote: > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > The last use of of_pm_clk_add_clk() was removed by 2019's > commit fe00f8900ca7 ("irqchip/gic-pm: Update driver to use clk_bulk APIs") > > Remove it. > > Note that the plural version of_pm_clk_add_clks() is still being > used and is left. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > --- > drivers/base/power/clock_ops.c | 33 --------------------------------- > include/linux/pm_clock.h | 1 - > 2 files changed, 34 deletions(-) > > diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c > index e18ba676cdf6..97a53215a274 100644 > --- a/drivers/base/power/clock_ops.c > +++ b/drivers/base/power/clock_ops.c > @@ -259,39 +259,6 @@ int pm_clk_add_clk(struct device *dev, struct clk *clk) > } > EXPORT_SYMBOL_GPL(pm_clk_add_clk); > > - > -/** > - * of_pm_clk_add_clk - Start using a device clock for power management. > - * @dev: Device whose clock is going to be used for power management. > - * @name: Name of clock that is going to be used for power management. > - * > - * Add the clock described in the 'clocks' device-tree node that matches > - * with the 'name' provided, to the list of clocks used for the power > - * management of @dev. On success, returns 0. Returns a negative error > - * code if the clock is not found or cannot be added. > - */ > -int of_pm_clk_add_clk(struct device *dev, const char *name) > -{ > - struct clk *clk; > - int ret; > - > - if (!dev || !dev->of_node || !name) > - return -EINVAL; > - > - clk = of_clk_get_by_name(dev->of_node, name); > - if (IS_ERR(clk)) > - return PTR_ERR(clk); > - > - ret = pm_clk_add_clk(dev, clk); > - if (ret) { > - clk_put(clk); > - return ret; > - } > - > - return 0; > -} > -EXPORT_SYMBOL_GPL(of_pm_clk_add_clk); > - > /** > * of_pm_clk_add_clks - Start using device clock(s) for power management. > * @dev: Device whose clock(s) is going to be used for power management. > diff --git a/include/linux/pm_clock.h b/include/linux/pm_clock.h > index 68669ce18720..45c3f3ccbaf8 100644 > --- a/include/linux/pm_clock.h > +++ b/include/linux/pm_clock.h > @@ -41,7 +41,6 @@ extern int pm_clk_create(struct device *dev); > extern void pm_clk_destroy(struct device *dev); > extern int pm_clk_add(struct device *dev, const char *con_id); > extern int pm_clk_add_clk(struct device *dev, struct clk *clk); > -extern int of_pm_clk_add_clk(struct device *dev, const char *name); > extern int of_pm_clk_add_clks(struct device *dev); > extern void pm_clk_remove(struct device *dev, const char *con_id); > extern void pm_clk_remove_clk(struct device *dev, struct clk *clk); > -- Applied as 6.15 material, thanks!
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index e18ba676cdf6..97a53215a274 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -259,39 +259,6 @@ int pm_clk_add_clk(struct device *dev, struct clk *clk) } EXPORT_SYMBOL_GPL(pm_clk_add_clk); - -/** - * of_pm_clk_add_clk - Start using a device clock for power management. - * @dev: Device whose clock is going to be used for power management. - * @name: Name of clock that is going to be used for power management. - * - * Add the clock described in the 'clocks' device-tree node that matches - * with the 'name' provided, to the list of clocks used for the power - * management of @dev. On success, returns 0. Returns a negative error - * code if the clock is not found or cannot be added. - */ -int of_pm_clk_add_clk(struct device *dev, const char *name) -{ - struct clk *clk; - int ret; - - if (!dev || !dev->of_node || !name) - return -EINVAL; - - clk = of_clk_get_by_name(dev->of_node, name); - if (IS_ERR(clk)) - return PTR_ERR(clk); - - ret = pm_clk_add_clk(dev, clk); - if (ret) { - clk_put(clk); - return ret; - } - - return 0; -} -EXPORT_SYMBOL_GPL(of_pm_clk_add_clk); - /** * of_pm_clk_add_clks - Start using device clock(s) for power management. * @dev: Device whose clock(s) is going to be used for power management. diff --git a/include/linux/pm_clock.h b/include/linux/pm_clock.h index 68669ce18720..45c3f3ccbaf8 100644 --- a/include/linux/pm_clock.h +++ b/include/linux/pm_clock.h @@ -41,7 +41,6 @@ extern int pm_clk_create(struct device *dev); extern void pm_clk_destroy(struct device *dev); extern int pm_clk_add(struct device *dev, const char *con_id); extern int pm_clk_add_clk(struct device *dev, struct clk *clk); -extern int of_pm_clk_add_clk(struct device *dev, const char *name); extern int of_pm_clk_add_clks(struct device *dev); extern void pm_clk_remove(struct device *dev, const char *con_id); extern void pm_clk_remove_clk(struct device *dev, struct clk *clk);