Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28cb5ef1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM: Create PM workqueue if runtime PM is not configured too 



The PM workqueue is going to be used by ACPI PM notify handlers
regardless of whether or not runtime PM is configured, so move
it out of #ifdef CONFIG_PM_RUNTIME.

Do that in three places in the ACPI device PM code.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9a3c4145

include/linux/pm_runtime.h

+9 −2
Original line number Diff line number Diff line
@@ -24,11 +24,20 @@ 
#define RPM_AUTO		0x08	/* Use autosuspend_delay */



#ifdef CONFIG_PM

extern struct workqueue_struct *pm_wq;



static inline bool queue_pm_work(struct work_struct *work)

{

	return queue_work(pm_wq, work);

}



extern int pm_generic_runtime_suspend(struct device *dev);

extern int pm_generic_runtime_resume(struct device *dev);

extern int pm_runtime_force_suspend(struct device *dev);

extern int pm_runtime_force_resume(struct device *dev);

#else

static inline bool queue_pm_work(struct work_struct *work) { return false; }



static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }

static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }

static inline int pm_runtime_force_suspend(struct device *dev) { return 0; }
@@ -37,8 +46,6 @@ static inline int pm_runtime_force_resume(struct device *dev) { return 0; } 


#ifdef CONFIG_PM_RUNTIME



extern struct workqueue_struct *pm_wq;



extern int __pm_runtime_idle(struct device *dev, int rpmflags);

extern int __pm_runtime_suspend(struct device *dev, int rpmflags);

extern int __pm_runtime_resume(struct device *dev, int rpmflags);

kernel/power/main.c

+0 −4
Original line number Diff line number Diff line
@@ -615,7 +615,6 @@ static struct attribute_group attr_group = { 
	.attrs = g,

};



#ifdef CONFIG_PM_RUNTIME

struct workqueue_struct *pm_wq;

EXPORT_SYMBOL_GPL(pm_wq);
@@ -625,9 +624,6 @@ static int __init pm_start_workqueue(void) 


	return pm_wq ? 0 : -ENOMEM;

}

#else

static inline int pm_start_workqueue(void) { return 0; }

#endif



static int __init pm_init(void)

{