| Message ID | 20210402061422.3396-1-yuehaibing@huawei.com |
|---|---|
| State | Accepted |
| Commit | 953c1fd96b1a70bcbbfb10973c2126eba8d891c7 |
| Headers | show |
| Series | [-next] PM: runtime: Replace inline function pm_runtime_callbacks_present() | expand |
On Fri, Apr 2, 2021 at 8:14 AM YueHaibing <yuehaibing@huawei.com> wrote: > > commit 9a7875461fd0 ("PM: runtime: Replace pm_runtime_callbacks_present()") > forget to change the inline version. > > Fixes: 9a7875461fd0 ("PM: runtime: Replace pm_runtime_callbacks_present()") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > include/linux/pm_runtime.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h > index b492ae00cc90..6c08a085367b 100644 > --- a/include/linux/pm_runtime.h > +++ b/include/linux/pm_runtime.h > @@ -265,7 +265,7 @@ static inline void pm_runtime_no_callbacks(struct device *dev) {} > static inline void pm_runtime_irq_safe(struct device *dev) {} > static inline bool pm_runtime_is_irq_safe(struct device *dev) { return false; } > > -static inline bool pm_runtime_callbacks_present(struct device *dev) { return false; } > +static inline bool pm_runtime_has_no_callbacks(struct device *dev) { return false; } > static inline void pm_runtime_mark_last_busy(struct device *dev) {} > static inline void __pm_runtime_use_autosuspend(struct device *dev, > bool use) {} > -- Applied as 5.13 material, thanks!
diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index b492ae00cc90..6c08a085367b 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -265,7 +265,7 @@ static inline void pm_runtime_no_callbacks(struct device *dev) {} static inline void pm_runtime_irq_safe(struct device *dev) {} static inline bool pm_runtime_is_irq_safe(struct device *dev) { return false; } -static inline bool pm_runtime_callbacks_present(struct device *dev) { return false; } +static inline bool pm_runtime_has_no_callbacks(struct device *dev) { return false; } static inline void pm_runtime_mark_last_busy(struct device *dev) {} static inline void __pm_runtime_use_autosuspend(struct device *dev, bool use) {}
commit 9a7875461fd0 ("PM: runtime: Replace pm_runtime_callbacks_present()") forget to change the inline version. Fixes: 9a7875461fd0 ("PM: runtime: Replace pm_runtime_callbacks_present()") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- include/linux/pm_runtime.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)