| Message ID | 2735489.s4WY8YHBoM@kreacher (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | PM: runtime: Replace pm_runtime_callbacks_present() | expand |
On Thu, 28 May 2020 at 16:45, Rafael J. Wysocki <rjw@rjwysocki.net> wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > The name of pm_runtime_callbacks_present() is confusing, because > it suggests that the device has PM-runtime callbacks if 'true' is > returned by that function, but in fact that may not be the case, > so replace it with pm_runtime_has_no_callbacks() which is not > ambiguous. > > No functional impact. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Makes sense to me, feel free to add: Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > drivers/base/power/sysfs.c | 4 ++-- > include/linux/pm_runtime.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > Index: linux-pm/include/linux/pm_runtime.h > =================================================================== > --- linux-pm.orig/include/linux/pm_runtime.h > +++ linux-pm/include/linux/pm_runtime.h > @@ -102,9 +102,9 @@ static inline bool pm_runtime_enabled(st > return !dev->power.disable_depth; > } > > -static inline bool pm_runtime_callbacks_present(struct device *dev) > +static inline bool pm_runtime_has_no_callbacks(struct device *dev) > { > - return !dev->power.no_callbacks; > + return dev->power.no_callbacks; > } > > static inline void pm_runtime_mark_last_busy(struct device *dev) > Index: linux-pm/drivers/base/power/sysfs.c > =================================================================== > --- linux-pm.orig/drivers/base/power/sysfs.c > +++ linux-pm/drivers/base/power/sysfs.c > @@ -666,7 +666,7 @@ int dpm_sysfs_add(struct device *dev) > if (rc) > return rc; > > - if (pm_runtime_callbacks_present(dev)) { > + if (!pm_runtime_has_no_callbacks(dev)) { > rc = sysfs_merge_group(&dev->kobj, &pm_runtime_attr_group); > if (rc) > goto err_out; > @@ -709,7 +709,7 @@ int dpm_sysfs_change_owner(struct device > if (rc) > return rc; > > - if (pm_runtime_callbacks_present(dev)) { > + if (!pm_runtime_has_no_callbacks(dev)) { > rc = sysfs_group_change_owner( > &dev->kobj, &pm_runtime_attr_group, kuid, kgid); > if (rc) > > >
Index: linux-pm/include/linux/pm_runtime.h =================================================================== --- linux-pm.orig/include/linux/pm_runtime.h +++ linux-pm/include/linux/pm_runtime.h @@ -102,9 +102,9 @@ static inline bool pm_runtime_enabled(st return !dev->power.disable_depth; } -static inline bool pm_runtime_callbacks_present(struct device *dev) +static inline bool pm_runtime_has_no_callbacks(struct device *dev) { - return !dev->power.no_callbacks; + return dev->power.no_callbacks; } static inline void pm_runtime_mark_last_busy(struct device *dev) Index: linux-pm/drivers/base/power/sysfs.c =================================================================== --- linux-pm.orig/drivers/base/power/sysfs.c +++ linux-pm/drivers/base/power/sysfs.c @@ -666,7 +666,7 @@ int dpm_sysfs_add(struct device *dev) if (rc) return rc; - if (pm_runtime_callbacks_present(dev)) { + if (!pm_runtime_has_no_callbacks(dev)) { rc = sysfs_merge_group(&dev->kobj, &pm_runtime_attr_group); if (rc) goto err_out; @@ -709,7 +709,7 @@ int dpm_sysfs_change_owner(struct device if (rc) return rc; - if (pm_runtime_callbacks_present(dev)) { + if (!pm_runtime_has_no_callbacks(dev)) { rc = sysfs_group_change_owner( &dev->kobj, &pm_runtime_attr_group, kuid, kgid); if (rc)