Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

PM: hibernate: Drop unused snapshot_test argument

Browse Source 
snapshot_test argument is now unused in swsusp_close() and
load_image_and_restore(). Drop it

CC: linux-pm@vger.kernel.org
Acked-by: Christoph Hellwig <hch@lst.de>
Acked-by: "Rafael J. Wysocki" <rafael@kernel.org>
Acked-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230927093442.25915-17-jack@suse.cz
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Jan Kara 2023-09-27 11:34:23 +02:00 committed by Christian Brauner
parent e017d304c7
commit 93745df18e
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/power/hibernate.c
View File

@ -684,7 +684,7 @@ static void power_down(void)
cpu_relax();
}
static int load_image_and_restore(bool snapshot_test)
static int load_image_and_restore(void)
{
int error;
unsigned int flags;
@ -694,12 +694,12 @@ static int load_image_and_restore(bool snapshot_test)
lock_device_hotplug();
error = create_basic_memory_bitmaps();
if (error) {
swsusp_close(snapshot_test);
swsusp_close();
goto Unlock;
}
error = swsusp_read(&flags);
swsusp_close(snapshot_test);
swsusp_close();
if (!error)
error = hibernation_restore(flags & SF_PLATFORM_MODE);
@ -788,7 +788,7 @@ int hibernate(void)
pm_pr_dbg("Checking hibernation image\n");
error = swsusp_check(false);
if (!error)
error = load_image_and_restore(false);
error = load_image_and_restore();
}
thaw_processes();
@ -952,7 +952,7 @@ static int software_resume(void)
/* The snapshot device should not be opened while we're running */
if (!hibernate_acquire()) {
error = -EBUSY;
swsusp_close(true);
swsusp_close();
goto Unlock;
}
@ -973,7 +973,7 @@ static int software_resume(void)
goto Close_Finish;
}
error = load_image_and_restore(true);
error = load_image_and_restore();
thaw_processes();
Finish:
pm_notifier_call_chain(PM_POST_RESTORE);
@ -987,7 +987,7 @@ static int software_resume(void)
pm_pr_dbg("Hibernation image not present or could not be loaded.\n");
return error;
Close_Finish:
swsusp_close(true);
swsusp_close();
goto Finish;
}

2
kernel/power/power.h
View File

@ -172,7 +172,7 @@ int swsusp_check(bool exclusive);
extern void swsusp_free(void);
extern int swsusp_read(unsigned int *flags_p);
extern int swsusp_write(unsigned int flags);
void swsusp_close(bool exclusive);
void swsusp_close(void);
#ifdef CONFIG_SUSPEND
extern int swsusp_unmark(void);
#endif

6
kernel/power/swap.c
View File

@ -444,7 +444,7 @@ static int get_swap_writer(struct swap_map_handle *handle)
err_rel:
release_swap_writer(handle);
err_close:
swsusp_close(false);
swsusp_close();
return ret;
}
@ -509,7 +509,7 @@ static int swap_writer_finish(struct swap_map_handle *handle,
if (error)
free_all_swap_pages(root_swap);
release_swap_writer(handle);
swsusp_close(false);
swsusp_close();
return error;
}
@ -1569,7 +1569,7 @@ put:
* @exclusive: Close the resume device which is exclusively opened.
*/
void swsusp_close(bool exclusive)
void swsusp_close(void)
{
if (IS_ERR(hib_resume_bdev_handle)) {
pr_debug("Image device not initialised\n");