mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
PM: hibernate: fix sparse warnings
[ Upstream commit01de5fcd8b
] When building the kernel with sparse enabled 'C=1' the following warnings shows up: kernel/power/swap.c:390:29: warning: incorrect type in assignment (different base types) kernel/power/swap.c:390:29: expected int ret kernel/power/swap.c:390:29: got restricted blk_status_t This is due to function hib_wait_io() returns a 'blk_status_t' which is a bitwise u8. Commit5416da01ff
("PM: hibernate: Remove blk_status_to_errno in hib_wait_io") seemed to have mixed up the return type. However, the4e4cbee93d
("block: switch bios to blk_status_t") actually broke the behaviour by returning the wrong type. Rework so function hib_wait_io() returns a 'int' instead of 'blk_status_t' and make sure to call function blk_status_to_errno(hb->error)' when returning from function hib_wait_io() a int gets returned. Fixes:4e4cbee93d
("block: switch bios to blk_status_t") Fixes:5416da01ff
("PM: hibernate: Remove blk_status_to_errno in hib_wait_io") Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ff950ae832
commit
8f74e6d516
1 changed files with 1 additions and 1 deletions
|
@ -299,7 +299,7 @@ static int hib_submit_io(int op, int op_flags, pgoff_t page_off, void *addr,
|
|||
return error;
|
||||
}
|
||||
|
||||
static blk_status_t hib_wait_io(struct hib_bio_batch *hb)
|
||||
static int hib_wait_io(struct hib_bio_batch *hb)
|
||||
{
|
||||
/*
|
||||
* We are relying on the behavior of blk_plug that a thread with
|
||||
|
|
Loading…
Reference in a new issue