Commit e7b91521 authored by Johan Hovold's avatar Johan Hovold Committed by Rafael J. Wysocki
Browse files

PM: sleep: wakeirq: drop unused enable helpers 



Drop the wake-irq enable and disable helpers which have not been used
since commit bed57030 ("PM / wakeirq: Fix dedicated wakeirq for
drivers not using autosuspend").

Note that these functions are essentially just leftovers from the first
iteration of the wake-irq implementation where device drivers were
supposed to call these functions themselves instead of PM core (as
is also indicated by the bogus kernel doc comments).

Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8527beb1

drivers/base/power/wakeirq.c

+0 −49
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ static int __dev_pm_set_dedicated_wake_irq(struct device *dev, int irq, unsigned 
	return err;

}





/**

 * dev_pm_set_dedicated_wake_irq - Request a dedicated wake-up interrupt

 * @dev: Device entry
@@ -206,11 +205,6 @@ static int __dev_pm_set_dedicated_wake_irq(struct device *dev, int irq, unsigned 
 * Sets up a threaded interrupt handler for a device that has

 * a dedicated wake-up interrupt in addition to the device IO

 * interrupt.

 *

 * The interrupt starts disabled, and needs to be managed for

 * the device by the bus code or the device driver using

 * dev_pm_enable_wake_irq*() and dev_pm_disable_wake_irq*()

 * functions.

 */

int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq)

{
@@ -232,11 +226,6 @@ EXPORT_SYMBOL_GPL(dev_pm_set_dedicated_wake_irq); 
 * the status of WAKE_IRQ_DEDICATED_REVERSE to tell rpm_suspend()

 * to enable dedicated wake-up interrupt after running the runtime suspend

 * callback for @dev.

 *

 * The interrupt starts disabled, and needs to be managed for

 * the device by the bus code or the device driver using

 * dev_pm_enable_wake_irq*() and dev_pm_disable_wake_irq*()

 * functions.

 */

int dev_pm_set_dedicated_wake_irq_reverse(struct device *dev, int irq)

{
@@ -244,44 +233,6 @@ int dev_pm_set_dedicated_wake_irq_reverse(struct device *dev, int irq) 
}

EXPORT_SYMBOL_GPL(dev_pm_set_dedicated_wake_irq_reverse);



/**

 * dev_pm_enable_wake_irq - Enable device wake-up interrupt

 * @dev: Device

 *

 * Optionally called from the bus code or the device driver for

 * runtime_resume() to override the PM runtime core managed wake-up

 * interrupt handling to enable the wake-up interrupt.

 *

 * Note that for runtime_suspend()) the wake-up interrupts

 * should be unconditionally enabled unlike for suspend()

 * that is conditional.

 */

void dev_pm_enable_wake_irq(struct device *dev)

{

	struct wake_irq *wirq = dev->power.wakeirq;



	if (wirq && (wirq->status & WAKE_IRQ_DEDICATED_ALLOCATED))

		enable_irq(wirq->irq);

}

EXPORT_SYMBOL_GPL(dev_pm_enable_wake_irq);



/**

 * dev_pm_disable_wake_irq - Disable device wake-up interrupt

 * @dev: Device

 *

 * Optionally called from the bus code or the device driver for

 * runtime_suspend() to override the PM runtime core managed wake-up

 * interrupt handling to disable the wake-up interrupt.

 */

void dev_pm_disable_wake_irq(struct device *dev)

{

	struct wake_irq *wirq = dev->power.wakeirq;



	if (wirq && (wirq->status & WAKE_IRQ_DEDICATED_ALLOCATED))

		disable_irq_nosync(wirq->irq);

}

EXPORT_SYMBOL_GPL(dev_pm_disable_wake_irq);



/**

 * dev_pm_enable_wake_irq_check - Checks and enables wake-up interrupt

 * @dev: Device

include/linux/pm_wakeirq.h

+0 −10
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ extern int dev_pm_set_wake_irq(struct device *dev, int irq); 
extern int dev_pm_set_dedicated_wake_irq(struct device *dev, int irq);

extern int dev_pm_set_dedicated_wake_irq_reverse(struct device *dev, int irq);

extern void dev_pm_clear_wake_irq(struct device *dev);

extern void dev_pm_enable_wake_irq(struct device *dev);

extern void dev_pm_disable_wake_irq(struct device *dev);



#else	/* !CONFIG_PM */
@@ -34,13 +32,5 @@ static inline void dev_pm_clear_wake_irq(struct device *dev) 
{

}



static inline void dev_pm_enable_wake_irq(struct device *dev)

{

}



static inline void dev_pm_disable_wake_irq(struct device *dev)

{

}



#endif	/* CONFIG_PM */

#endif	/* _LINUX_PM_WAKEIRQ_H */