Re: [linux-pm] Re: [PATCH] Don't explode on swsusp failure to find swap

Pavel Machek
2005-06-01T20:42:07Z

Hi!

> > diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
> > --- a/kernel/power/swsusp.c
> > +++ b/kernel/power/swsusp.c
> > @@ -975,13 +975,6 @@ extern asmlinkage int swsusp_arch_resume
> >
> > asmlinkage int swsusp_save(void)
> > {
> > - int error = 0;
> > -
> > - if ((error = swsusp_swap_check())) {
> > - printk(KERN_ERR "swsusp: FATAL: cannot find swap device, try "
> > - "swapon -a!\n");
> > - return error;
> > - }
> > return suspend_prepare_image();
> > }
>
> I think we can move the contents of suspend_prepare_image() directly to
> swsusp_save(). It's not used anywhere else.

I thought about that, too, but bugfixes first, cleanups next.

Pavel