hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PM: Improve error code of pm_notifier_call_chain() 

This enables pm_notifier_call_chain() to get the actual error code
in the callback rather than always assume -EINVAL by converting all
PM notifier calls to return encapsulate error code with
notifier_from_errno().

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Akinobu Mita 2011-07-08 20:53:36 +02:00 committed by Rafael J. Wysocki
parent 1d8047a6f7
commit f0c077a8b7
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/apm-emulation.c
View File

@ -606,7 +606,7 @@ static int apm_suspend_notifier(struct notifier_block *nb,
return NOTIFY_OK; return NOTIFY_OK;
/* interrupted by signal */ /* interrupted by signal */
return NOTIFY_BAD; return notifier_from_errno(err);
case PM_POST_SUSPEND: case PM_POST_SUSPEND:
/* /*

4
drivers/s390/char/vmwatchdog.c
View File

@ -258,13 +258,13 @@ static int vmwdt_suspend(void)
if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) { if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) {
pr_err("The system cannot be suspended while the watchdog" pr_err("The system cannot be suspended while the watchdog"
" is in use\n"); " is in use\n");
return NOTIFY_BAD; return notifier_from_errno(-EBUSY);
} }
if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) { if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) {
clear_bit(VMWDT_OPEN, &vmwdt_is_open); clear_bit(VMWDT_OPEN, &vmwdt_is_open);
pr_err("The system cannot be suspended while the watchdog" pr_err("The system cannot be suspended while the watchdog"
" is running\n"); " is running\n");
return NOTIFY_BAD; return notifier_from_errno(-EBUSY);
} }
return NOTIFY_DONE; return NOTIFY_DONE;
} }

8
drivers/s390/cio/css.c
View File

@ -814,8 +814,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event,
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
continue; continue;
} }
if (__chsc_do_secm(css, 0)) ret = __chsc_do_secm(css, 0);
ret = NOTIFY_BAD; ret = notifier_from_errno(ret);
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
} }
break; break;
@ -831,8 +831,8 @@ static int css_power_event(struct notifier_block *this, unsigned long event,
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
continue; continue;
} }
if (__chsc_do_secm(css, 1)) ret = __chsc_do_secm(css, 1);
ret = NOTIFY_BAD; ret = notifier_from_errno(ret);
mutex_unlock(&css->mutex); mutex_unlock(&css->mutex);
} }
/* search for subchannels, which appeared during hibernation */ /* search for subchannels, which appeared during hibernation */

5
kernel/power/main.c
View File

@ -37,8 +37,9 @@ EXPORT_SYMBOL_GPL(unregister_pm_notifier);
int pm_notifier_call_chain(unsigned long val) int pm_notifier_call_chain(unsigned long val)
{ {
return (blocking_notifier_call_chain(&pm_chain_head, val, NULL) int ret = blocking_notifier_call_chain(&pm_chain_head, val, NULL);
== NOTIFY_BAD) ? -EINVAL : 0;
return notifier_to_errno(ret);
} }
/* If set, devices may be suspended and resumed asynchronously. */ /* If set, devices may be suspended and resumed asynchronously. */