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

Commit 9a3df1f7 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

PM: Convert wakeup flag accessors to inline functions 



This patch (as1058) improves the wakeup macros in include/linux/pm.h.
All but the trivial ones are converted to inline routines, which
requires moving them to a separate header file since they depend on
the definition of struct device.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d288e47c

include/linux/device.h

+3 −0
Original line number Diff line number Diff line
@@ -475,6 +475,9 @@ struct device { 
	void	(*release)(struct device *dev);

};



/* Get the wakeup routines, which depend on struct device */

#include <linux/pm_wakeup.h>



#ifdef CONFIG_NUMA

static inline int dev_to_node(struct device *dev)

{

include/linux/pm.h

+1 −45
Original line number Diff line number Diff line
@@ -216,50 +216,6 @@ static inline int device_suspend(pm_message_t state) 


#endif /* !CONFIG_PM_SLEEP */



#ifdef CONFIG_PM



#define device_set_wakeup_enable(dev,val) \

	((dev)->power.should_wakeup = !!(val))

#define device_may_wakeup(dev) \

	(device_can_wakeup(dev) && (dev)->power.should_wakeup)



/*

 * Platform hook to activate device wakeup capability, if that's not already

 * handled by enable_irq_wake() etc.

 * Returns zero on success, else negative errno

 */

extern int (*platform_enable_wakeup)(struct device *dev, int is_on);



static inline int call_platform_enable_wakeup(struct device *dev, int is_on)

{

	if (platform_enable_wakeup)

		return (*platform_enable_wakeup)(dev, is_on);

	return 0;

}



#else /* !CONFIG_PM */



#define device_set_wakeup_enable(dev,val)	do{}while(0)

#define device_may_wakeup(dev)			(0)



static inline int call_platform_enable_wakeup(struct device *dev, int is_on)

{

	return 0;

}



#endif /* !CONFIG_PM */



/* changes to device_may_wakeup take effect on the next pm state change.

 * by default, devices should wakeup if they can.

 */

#define device_can_wakeup(dev) \

	((dev)->power.can_wakeup)

#define device_init_wakeup(dev,val) \

	do { \

		device_can_wakeup(dev) = !!(val); \

		device_set_wakeup_enable(dev,val); \

	} while(0)



/*

 * Global Power Management flags

 * Used to keep APM and ACPI from both being active

include/linux/pm_wakeup.h

0 → 100644
+90 −0
Original line number Diff line number Diff line 
/*

 *  pm_wakeup.h - Power management wakeup interface

 *

 *  Copyright (C) 2008 Alan Stern

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#ifndef _LINUX_PM_WAKEUP_H

#define _LINUX_PM_WAKEUP_H



#ifndef _DEVICE_H_

# error "please don't include this file directly"

#endif



#ifdef CONFIG_PM



/* changes to device_may_wakeup take effect on the next pm state change.

 * by default, devices should wakeup if they can.

 */

static inline void device_init_wakeup(struct device *dev, int val)

{

	dev->power.can_wakeup = dev->power.should_wakeup = !!val;

}



static inline int device_can_wakeup(struct device *dev)

{

	return dev->power.can_wakeup;

}



static inline void device_set_wakeup_enable(struct device *dev, int val)

{

	dev->power.should_wakeup = !!val;

}



static inline int device_may_wakeup(struct device *dev)

{

	return dev->power.can_wakeup & dev->power.should_wakeup;

}



/*

 * Platform hook to activate device wakeup capability, if that's not already

 * handled by enable_irq_wake() etc.

 * Returns zero on success, else negative errno

 */

extern int (*platform_enable_wakeup)(struct device *dev, int is_on);



static inline int call_platform_enable_wakeup(struct device *dev, int is_on)

{

	if (platform_enable_wakeup)

		return (*platform_enable_wakeup)(dev, is_on);

	return 0;

}



#else /* !CONFIG_PM */



/* For some reason the next two routines work even without CONFIG_PM */

static inline void device_init_wakeup(struct device *dev, int val)

{

	dev->power.can_wakeup = !!val;

}



static inline int device_can_wakeup(struct device *dev)

{

	return dev->power.can_wakeup;

}



#define device_set_wakeup_enable(dev, val)	do {} while (0)

#define device_may_wakeup(dev)			0



static inline int call_platform_enable_wakeup(struct device *dev, int is_on)

{

	return 0;

}



#endif /* !CONFIG_PM */



#endif /* _LINUX_PM_WAKEUP_H */