On Fri, Aug 11, 2023 at 1:05 PM Jan Kara <jack@xxxxxxx> wrote:
>
> snapshot_test argument is now unused in swsusp_close() and
> load_image_and_restore(). Drop it
>
> CC: linux-pm@xxxxxxxxxxxxxxx
> Signed-off-by: Jan Kara <jack@xxxxxxx>
Acked-by: Rafael J. Wysocki <rafael@xxxxxxxxxx>
> ---
> kernel/power/hibernate.c | 14 +++++++-------
> kernel/power/power.h | 2 +-
> kernel/power/swap.c | 6 +++---
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index e1b4bfa938dd..6abeec0ae084 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -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(snapshot_test);
> if (!error)
> - error = load_image_and_restore(snapshot_test);
> + 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(false);
> + swsusp_close();
> goto Unlock;
> }
>
> @@ -973,7 +973,7 @@ static int software_resume(void)
> goto Close_Finish;
> }
>
> - error = load_image_and_restore(false);
> + 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(false);
> + swsusp_close();
> goto Finish;
> }
>
> diff --git a/kernel/power/power.h b/kernel/power/power.h
> index 46eb14dc50c3..bebf049a51c1 100644
> --- a/kernel/power/power.h
> +++ b/kernel/power/power.h
> @@ -172,7 +172,7 @@ int swsusp_check(bool snapshot_test);
> extern void swsusp_free(void);
> extern int swsusp_read(unsigned int *flags_p);
> extern int swsusp_write(unsigned int flags);
> -void swsusp_close(bool snapshot_test);
> +void swsusp_close(void);
> #ifdef CONFIG_SUSPEND
> extern int swsusp_unmark(void);
> #endif
> diff --git a/kernel/power/swap.c b/kernel/power/swap.c
> index b475bee282ff..17e0dad5008e 100644
> --- a/kernel/power/swap.c
> +++ b/kernel/power/swap.c
> @@ -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;
> }
> @@ -1567,7 +1567,7 @@ int swsusp_check(bool snapshot_test)
> * swsusp_close - close swap device.
> */
>
> -void swsusp_close(bool snapshot_test)
> +void swsusp_close(void)
> {
> if (IS_ERR(hib_resume_bdev_handle)) {
> pr_debug("Image device not initialised\n");
> --
> 2.35.3
>
