| Message ID | 20210118005524.27787-10-digetx@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | OPP API fixes and improvements | expand |
On 18-01-21, 03:55, Dmitry Osipenko wrote: > Add resource-managed version of dev_pm_opp_attach_genpd(). > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > --- > drivers/opp/core.c | 35 +++++++++++++++++++++++++++++++++++ > include/linux/pm_opp.h | 8 ++++++++ > 2 files changed, 43 insertions(+) > > diff --git a/drivers/opp/core.c b/drivers/opp/core.c > index 8e0d2193fd5f..49419ab9fbb4 100644 > --- a/drivers/opp/core.c > +++ b/drivers/opp/core.c > @@ -2891,3 +2891,38 @@ devm_pm_opp_register_set_opp_helper(struct device *dev, > return opp_table; > } > EXPORT_SYMBOL_GPL(devm_pm_opp_register_set_opp_helper); > + > +static void devm_pm_opp_detach_genpd(void *data) > +{ > + dev_pm_opp_detach_genpd(data); > +} > + > +/** > + * devm_pm_opp_attach_genpd - Attach genpd(s) for the device and save virtual device pointer > + * @dev: Consumer device for which the genpd is getting attached. > + * @names: Null terminated array of pointers containing names of genpd to attach. > + * @virt_devs: Pointer to return the array of virtual devices. > + * > + * This is a resource-managed version of dev_pm_opp_attach_genpd(). > + * > + * Return: pointer to 'struct opp_table' on success and errorno otherwise. > + */ > +struct opp_table * > +devm_pm_opp_attach_genpd(struct device *dev, const char **names, > + struct device ***virt_devs) > +{ > + struct opp_table *opp_table; > + int err; > + > + opp_table = dev_pm_opp_attach_genpd(dev, names, virt_devs); > + if (IS_ERR(opp_table)) > + return opp_table; > + > + err = devm_add_action_or_reset(dev, devm_pm_opp_detach_genpd, > + opp_table); > + if (err) > + return ERR_PTR(err); > + > + return opp_table; > +} > +EXPORT_SYMBOL_GPL(devm_pm_opp_attach_genpd); > diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h > index 6de5853aaada..eefd0b15890c 100644 > --- a/include/linux/pm_opp.h > +++ b/include/linux/pm_opp.h > @@ -170,6 +170,7 @@ void dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask); > int dev_pm_opp_sync_regulators(struct device *dev); > int dev_pm_opp_set_voltage(struct device *dev, struct dev_pm_opp *opp); > struct opp_table *devm_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data)); > +struct opp_table *devm_pm_opp_attach_genpd(struct device *dev, const char **names, struct device ***virt_devs); > #else > static inline struct opp_table *dev_pm_opp_get_opp_table(struct device *dev) > { > @@ -436,6 +437,13 @@ devm_pm_opp_register_set_opp_helper(struct device *dev, > return ERR_PTR(-ENOTSUPP); > } > > +static inline struct opp_table * > +devm_pm_opp_attach_genpd(struct device *dev, const char **names, > + struct device ***virt_devs) > +{ > + return ERR_PTR(-ENOTSUPP); > +} > + > #endif /* CONFIG_PM_OPP */ > > #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF) Manually applied. Thanks.
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 8e0d2193fd5f..49419ab9fbb4 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2891,3 +2891,38 @@ devm_pm_opp_register_set_opp_helper(struct device *dev, return opp_table; } EXPORT_SYMBOL_GPL(devm_pm_opp_register_set_opp_helper); + +static void devm_pm_opp_detach_genpd(void *data) +{ + dev_pm_opp_detach_genpd(data); +} + +/** + * devm_pm_opp_attach_genpd - Attach genpd(s) for the device and save virtual device pointer + * @dev: Consumer device for which the genpd is getting attached. + * @names: Null terminated array of pointers containing names of genpd to attach. + * @virt_devs: Pointer to return the array of virtual devices. + * + * This is a resource-managed version of dev_pm_opp_attach_genpd(). + * + * Return: pointer to 'struct opp_table' on success and errorno otherwise. + */ +struct opp_table * +devm_pm_opp_attach_genpd(struct device *dev, const char **names, + struct device ***virt_devs) +{ + struct opp_table *opp_table; + int err; + + opp_table = dev_pm_opp_attach_genpd(dev, names, virt_devs); + if (IS_ERR(opp_table)) + return opp_table; + + err = devm_add_action_or_reset(dev, devm_pm_opp_detach_genpd, + opp_table); + if (err) + return ERR_PTR(err); + + return opp_table; +} +EXPORT_SYMBOL_GPL(devm_pm_opp_attach_genpd); diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 6de5853aaada..eefd0b15890c 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -170,6 +170,7 @@ void dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask); int dev_pm_opp_sync_regulators(struct device *dev); int dev_pm_opp_set_voltage(struct device *dev, struct dev_pm_opp *opp); struct opp_table *devm_pm_opp_register_set_opp_helper(struct device *dev, int (*set_opp)(struct dev_pm_set_opp_data *data)); +struct opp_table *devm_pm_opp_attach_genpd(struct device *dev, const char **names, struct device ***virt_devs); #else static inline struct opp_table *dev_pm_opp_get_opp_table(struct device *dev) { @@ -436,6 +437,13 @@ devm_pm_opp_register_set_opp_helper(struct device *dev, return ERR_PTR(-ENOTSUPP); } +static inline struct opp_table * +devm_pm_opp_attach_genpd(struct device *dev, const char **names, + struct device ***virt_devs) +{ + return ERR_PTR(-ENOTSUPP); +} + #endif /* CONFIG_PM_OPP */ #if defined(CONFIG_PM_OPP) && defined(CONFIG_OF)
Add resource-managed version of dev_pm_opp_attach_genpd(). Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- drivers/opp/core.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 8 ++++++++ 2 files changed, 43 insertions(+)