@@ -352,30 +352,6 @@ static int axp20x_pek_probe(struct platform_device *pdev)
return 0;
}
-static int __maybe_unused axp20x_pek_resume_noirq(struct device *dev)
-{
- struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev);
-
- if (axp20x_pek->axp20x->variant != AXP288_ID)
- return 0;
-
- /*
- * Clear interrupts from button presses during suspend, to avoid
- * a wakeup power-button press getting reported to userspace.
- */
- regmap_write(axp20x_pek->axp20x->regmap,
- AXP20X_IRQ1_STATE + AXP288_IRQ_POKN / 8,
- BIT(AXP288_IRQ_POKN % 8));
-
- return 0;
-}
-
-static const struct dev_pm_ops axp20x_pek_pm_ops = {
-#ifdef CONFIG_PM_SLEEP
- .resume_noirq = axp20x_pek_resume_noirq,
-#endif
-};
-
static const struct platform_device_id axp_pek_id_match[] = {
{
.name = "axp20x-pek",
@@ -394,7 +370,6 @@ static struct platform_driver axp20x_pek_driver = {
.id_table = axp_pek_id_match,
.driver = {
.name = "axp20x-pek",
- .pm = &axp20x_pek_pm_ops,
.dev_groups = axp20x_groups,
},
};
This driver attempts to avoid reporting wakeup events to userspace by clearing a possible pending IRQ before IRQs are enabled during resume. The assumption seems to be that userspace cannot cope with a KEY_POWER press during resume. However, no other input driver does this, so it would be a bug that such events are missing with this driver. Furthermore, for PMICs connected via I2C or RSB, it is not possible to update the regmap during the noirq resume phase, because the bus controller drivers require IRQs to perform bus transactions. And the resume hook cannot move to a later phase, because then it would race with the power key IRQ handler. So the best solution seems to be simply removing the hook. Signed-off-by: Samuel Holland <samuel@sholland.org> --- drivers/input/misc/axp20x-pek.c | 25 ------------------------- 1 file changed, 25 deletions(-)