This is a follow up patch based on discussions with Rafael[0] on a previous patch I sent to propagate return value from device_wakeup_disable further upward inside device_init_wakeup However, it doesn't seem like today any return values from device_wakeup_disable are very useful to the caller. I could only spot one caller of this function that was actually propagating the return value upward other than the PM core calls. I have tried to update sdhci-pci-core to work with the new changes I think that the patch 3/3 should go via Adrian or Ulf's tree, rest are all PM core changes. [0] https://lore.kernel.org/all/CAJZ5v0jbHwiZemtNAoM-jmgB_58VqmKUkqv4P7qrPkxWzBzMyQ@xxxxxxxxxxxxxx/ Dhruva Gole (3): PM: wakeup: make device_wakeup_disable return void PM: wakeup: Remove unnecessary else from device_init_wakeup mmc: sdhci-pci: Use device_set_wakeup_enable for en/disable wakeups drivers/base/power/wakeup.c | 11 +++++++---- drivers/mmc/host/sdhci-pci-core.c | 4 ++-- include/linux/pm_wakeup.h | 12 +++++------- 3 files changed, 14 insertions(+), 13 deletions(-) -- 2.34.1