| Message ID | 20250307021750.457600-1-linux@treblig.org (mailing list archive) |
|---|---|
| State | Queued |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | drivers: base: power: Remove unused pm_generic_ wrappers | expand |
On Fri, Mar 7, 2025 at 3:18 AM <linux@treblig.org> wrote: > > From: "Dr. David Alan Gilbert" <linux@treblig.org> > > pm_generic_thaw_early() has been unused since 2016's > commit 294f47ffd55c ("PM / Domains: Remove redundant system PM callbacks") > > pm_generic_freeze_late() has been unused since 2019's > commit 3cd7957e85e6 ("ACPI: PM: Simplify and fix PM domain hibernation > callbacks") > > Remove them. > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> > --- > drivers/base/power/generic_ops.c | 24 ------------------------ > include/linux/pm.h | 4 ---- > 2 files changed, 28 deletions(-) > > diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c > index 4fa525668cb7..6502720bb564 100644 > --- a/drivers/base/power/generic_ops.c > +++ b/drivers/base/power/generic_ops.c > @@ -114,18 +114,6 @@ int pm_generic_freeze_noirq(struct device *dev) > } > EXPORT_SYMBOL_GPL(pm_generic_freeze_noirq); > > -/** > - * pm_generic_freeze_late - Generic freeze_late callback for subsystems. > - * @dev: Device to freeze. > - */ > -int pm_generic_freeze_late(struct device *dev) > -{ > - const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; > - > - return pm && pm->freeze_late ? pm->freeze_late(dev) : 0; > -} > -EXPORT_SYMBOL_GPL(pm_generic_freeze_late); > - > /** > * pm_generic_freeze - Generic freeze callback for subsystems. > * @dev: Device to freeze. > @@ -186,18 +174,6 @@ int pm_generic_thaw_noirq(struct device *dev) > } > EXPORT_SYMBOL_GPL(pm_generic_thaw_noirq); > > -/** > - * pm_generic_thaw_early - Generic thaw_early callback for subsystems. > - * @dev: Device to thaw. > - */ > -int pm_generic_thaw_early(struct device *dev) > -{ > - const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; > - > - return pm && pm->thaw_early ? pm->thaw_early(dev) : 0; > -} > -EXPORT_SYMBOL_GPL(pm_generic_thaw_early); > - > /** > * pm_generic_thaw - Generic thaw callback for subsystems. > * @dev: Device to thaw. > diff --git a/include/linux/pm.h b/include/linux/pm.h > index 78855d794342..7bf22ed4a1d5 100644 > --- a/include/linux/pm.h > +++ b/include/linux/pm.h > @@ -838,10 +838,8 @@ extern int pm_generic_resume_early(struct device *dev); > extern int pm_generic_resume_noirq(struct device *dev); > extern int pm_generic_resume(struct device *dev); > extern int pm_generic_freeze_noirq(struct device *dev); > -extern int pm_generic_freeze_late(struct device *dev); > extern int pm_generic_freeze(struct device *dev); > extern int pm_generic_thaw_noirq(struct device *dev); > -extern int pm_generic_thaw_early(struct device *dev); > extern int pm_generic_thaw(struct device *dev); > extern int pm_generic_restore_noirq(struct device *dev); > extern int pm_generic_restore_early(struct device *dev); > @@ -883,10 +881,8 @@ static inline void dpm_for_each_dev(void *data, void (*fn)(struct device *, void > #define pm_generic_resume_noirq NULL > #define pm_generic_resume NULL > #define pm_generic_freeze_noirq NULL > -#define pm_generic_freeze_late NULL > #define pm_generic_freeze NULL > #define pm_generic_thaw_noirq NULL > -#define pm_generic_thaw_early NULL > #define pm_generic_thaw NULL > #define pm_generic_restore_noirq NULL > #define pm_generic_restore_early NULL > -- Applied as 6.15 material, thanks!
diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c index 4fa525668cb7..6502720bb564 100644 --- a/drivers/base/power/generic_ops.c +++ b/drivers/base/power/generic_ops.c @@ -114,18 +114,6 @@ int pm_generic_freeze_noirq(struct device *dev) } EXPORT_SYMBOL_GPL(pm_generic_freeze_noirq); -/** - * pm_generic_freeze_late - Generic freeze_late callback for subsystems. - * @dev: Device to freeze. - */ -int pm_generic_freeze_late(struct device *dev) -{ - const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; - - return pm && pm->freeze_late ? pm->freeze_late(dev) : 0; -} -EXPORT_SYMBOL_GPL(pm_generic_freeze_late); - /** * pm_generic_freeze - Generic freeze callback for subsystems. * @dev: Device to freeze. @@ -186,18 +174,6 @@ int pm_generic_thaw_noirq(struct device *dev) } EXPORT_SYMBOL_GPL(pm_generic_thaw_noirq); -/** - * pm_generic_thaw_early - Generic thaw_early callback for subsystems. - * @dev: Device to thaw. - */ -int pm_generic_thaw_early(struct device *dev) -{ - const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm : NULL; - - return pm && pm->thaw_early ? pm->thaw_early(dev) : 0; -} -EXPORT_SYMBOL_GPL(pm_generic_thaw_early); - /** * pm_generic_thaw - Generic thaw callback for subsystems. * @dev: Device to thaw. diff --git a/include/linux/pm.h b/include/linux/pm.h index 78855d794342..7bf22ed4a1d5 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -838,10 +838,8 @@ extern int pm_generic_resume_early(struct device *dev); extern int pm_generic_resume_noirq(struct device *dev); extern int pm_generic_resume(struct device *dev); extern int pm_generic_freeze_noirq(struct device *dev); -extern int pm_generic_freeze_late(struct device *dev); extern int pm_generic_freeze(struct device *dev); extern int pm_generic_thaw_noirq(struct device *dev); -extern int pm_generic_thaw_early(struct device *dev); extern int pm_generic_thaw(struct device *dev); extern int pm_generic_restore_noirq(struct device *dev); extern int pm_generic_restore_early(struct device *dev); @@ -883,10 +881,8 @@ static inline void dpm_for_each_dev(void *data, void (*fn)(struct device *, void #define pm_generic_resume_noirq NULL #define pm_generic_resume NULL #define pm_generic_freeze_noirq NULL -#define pm_generic_freeze_late NULL #define pm_generic_freeze NULL #define pm_generic_thaw_noirq NULL -#define pm_generic_thaw_early NULL #define pm_generic_thaw NULL #define pm_generic_restore_noirq NULL #define pm_generic_restore_early NULL