| Message ID | 20210311192105.14998-2-digetx@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Introduce devm_pm_opp_* API | expand |
On 11-03-21, 22:20, Dmitry Osipenko wrote: > +struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name) > +{ > + struct opp_table *opp_table; > + int err; > + > + opp_table = dev_pm_opp_set_clkname(dev, name); > + if (IS_ERR(opp_table)) > + return opp_table; > + > + err = devm_add_action_or_reset(dev, devm_pm_opp_clkname_release, opp_table); > + if (err) > + opp_table = ERR_PTR(err); > + > + return opp_table; > +} I wonder if we still need to return opp_table from here, or a simple integer is fine.. The callers shouldn't be required to use the OPP table directly anymore I believe and so better simplify the return part of this and all other routines you are adding here.. If there is a user which needs the opp_table, let it use the regular non-devm variant.
On Fri, 12 Mar 2021 at 06:33, Viresh Kumar <viresh.kumar@linaro.org> wrote: > > On 11-03-21, 22:20, Dmitry Osipenko wrote: > > +struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name) > > +{ > > + struct opp_table *opp_table; > > + int err; > > + > > + opp_table = dev_pm_opp_set_clkname(dev, name); > > + if (IS_ERR(opp_table)) > > + return opp_table; > > + > > + err = devm_add_action_or_reset(dev, devm_pm_opp_clkname_release, opp_table); > > + if (err) > > + opp_table = ERR_PTR(err); > > + > > + return opp_table; > > +} > > I wonder if we still need to return opp_table from here, or a simple > integer is fine.. The callers shouldn't be required to use the OPP > table directly anymore I believe and so better simplify the return > part of this and all other routines you are adding here.. Yes, please. I was thinking along the same lines, when I reviewed the mmc patch (patch9). > > If there is a user which needs the opp_table, let it use the regular > non-devm variant. Kind regards Uffe
12.03.2021 13:36, Ulf Hansson пишет: > On Fri, 12 Mar 2021 at 06:33, Viresh Kumar <viresh.kumar@linaro.org> wrote: >> >> On 11-03-21, 22:20, Dmitry Osipenko wrote: >>> +struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name) >>> +{ >>> + struct opp_table *opp_table; >>> + int err; >>> + >>> + opp_table = dev_pm_opp_set_clkname(dev, name); >>> + if (IS_ERR(opp_table)) >>> + return opp_table; >>> + >>> + err = devm_add_action_or_reset(dev, devm_pm_opp_clkname_release, opp_table); >>> + if (err) >>> + opp_table = ERR_PTR(err); >>> + >>> + return opp_table; >>> +} >> >> I wonder if we still need to return opp_table from here, or a simple >> integer is fine.. The callers shouldn't be required to use the OPP >> table directly anymore I believe and so better simplify the return >> part of this and all other routines you are adding here.. > > Yes, please. I was thinking along the same lines, when I reviewed the > mmc patch (patch9). > >> >> If there is a user which needs the opp_table, let it use the regular >> non-devm variant. Indeed, that's a very good suggestion! The opp_table isn't needed by the devm users, I'll change it in v3, thanks!
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 150be4c28c99..3345ab8da6b2 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2119,6 +2119,42 @@ void dev_pm_opp_put_clkname(struct opp_table *opp_table) } EXPORT_SYMBOL_GPL(dev_pm_opp_put_clkname); +static void devm_pm_opp_clkname_release(void *data) +{ + dev_pm_opp_put_clkname(data); +} + +/** + * devm_pm_opp_set_clkname() - Set clk name for the device + * @dev: Device for which clk name is being set. + * @name: Clk name. + * + * In order to support OPP switching, OPP layer needs to get pointer to the + * clock for the device. Simple cases work fine without using this routine (i.e. + * by passing connection-id as NULL), but for a device with multiple clocks + * available, the OPP core needs to know the exact name of the clk to use. + * + * This must be called before any OPPs are initialized for the device. + * + * The opp_table structure will be freed after the device is destroyed. + */ +struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name) +{ + struct opp_table *opp_table; + int err; + + opp_table = dev_pm_opp_set_clkname(dev, name); + if (IS_ERR(opp_table)) + return opp_table; + + err = devm_add_action_or_reset(dev, devm_pm_opp_clkname_release, opp_table); + if (err) + opp_table = ERR_PTR(err); + + return opp_table; +} +EXPORT_SYMBOL_GPL(devm_pm_opp_set_clkname); + /** * dev_pm_opp_register_set_opp_helper() - Register custom set OPP helper * @dev: Device for which the helper is getting registered. diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index c0371efa4a0f..6fb992168f1e 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -150,6 +150,7 @@ struct opp_table *dev_pm_opp_set_regulators(struct device *dev, const char * con void dev_pm_opp_put_regulators(struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const char *name); void dev_pm_opp_put_clkname(struct opp_table *opp_table); +struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name); struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data)); void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table); struct opp_table *devm_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data)); @@ -355,6 +356,11 @@ static inline struct opp_table *dev_pm_opp_set_clkname(struct device *dev, const static inline void dev_pm_opp_put_clkname(struct opp_table *opp_table) {} +static inline struct opp_table *devm_pm_opp_set_clkname(struct device *dev, const char *name) +{ + return ERR_PTR(-EOPNOTSUPP); +} + static inline struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, const char **names, struct device ***virt_devs) { return ERR_PTR(-EOPNOTSUPP);