[PATCH] pm: remove unused asm/suspend.h

[PATCH] pm: remove unused asm/suspend.h

[Magnus Damm]

From: Magnus Damm <damm@igel.co.jp>

This patch removes unused asm/suspend.h files for
the following architectures:

 alpha, arm, ia64, m68k, mips, s390, um

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 arch/alpha/include/asm/suspend.h |    6 ------
 arch/arm/include/asm/suspend.h   |    4 ----
 arch/ia64/include/asm/suspend.h  |    1 -
 arch/m68k/include/asm/suspend.h  |    6 ------
 arch/mips/include/asm/suspend.h  |    6 ------
 arch/s390/include/asm/suspend.h  |    5 -----
 arch/um/include/asm/suspend.h    |    4 ----
 7 files changed, 32 deletions(-)

--- 0001/arch/alpha/include/asm/suspend.h
+++ /dev/null	2009-05-12 09:34:44.497006305 +0900
@@ -1,6 +0,0 @@
-#ifndef __ALPHA_SUSPEND_H
-#define __ALPHA_SUSPEND_H
-
-/* Dummy include. */
-
-#endif  /* __ALPHA_SUSPEND_H */
--- 0001/arch/arm/include/asm/suspend.h
+++ /dev/null	2009-05-12 09:34:44.497006305 +0900
@@ -1,4 +0,0 @@
-#ifndef _ASMARM_SUSPEND_H
-#define _ASMARM_SUSPEND_H
-
-#endif
--- 0001/arch/ia64/include/asm/suspend.h
+++ /dev/null	2009-05-12 09:34:44.497006305 +0900
@@ -1 +0,0 @@
-/* dummy (must be non-empty to prevent prejudicial removal...) */
--- 0001/arch/m68k/include/asm/suspend.h
+++ /dev/null	2009-05-12 09:34:44.497006305 +0900
@@ -1,6 +0,0 @@
-#ifndef _M68K_SUSPEND_H
-#define _M68K_SUSPEND_H
-
-/* Dummy include. */
-
-#endif  /* _M68K_SUSPEND_H */
--- 0001/arch/mips/include/asm/suspend.h
+++ /dev/null	2009-05-12 09:34:44.497006305 +0900
@@ -1,6 +0,0 @@
-#ifndef __ASM_SUSPEND_H
-#define __ASM_SUSPEND_H
-
-/* Somewhen...  Maybe :-)  */
-
-#endif /* __ASM_SUSPEND_H */
--- 0001/arch/s390/include/asm/suspend.h
+++ /dev/null	2009-05-12 09:34:44.497006305 +0900
@@ -1,5 +0,0 @@
-#ifndef __ASM_S390_SUSPEND_H
-#define __ASM_S390_SUSPEND_H
-
-#endif
-
--- 0001/arch/um/include/asm/suspend.h
+++ /dev/null	2009-05-12 09:34:44.497006305 +0900
@@ -1,4 +0,0 @@
-#ifndef __UM_SUSPEND_H
-#define __UM_SUSPEND_H
-
-#endif

Re: [PATCH] pm: remove unused asm/suspend.h

[Pavel Machek]

On Tue 2009-05-12 22:16:06, Magnus Damm wrote:
> 
> From: Magnus Damm <damm@igel.co.jp>
> 
> This patch removes unused asm/suspend.h files for
> the following architectures:
> 
>  alpha, arm, ia64, m68k, mips, s390, um
> 
> Signed-off-by: Magnus Damm <damm@igel.co.jp>

Are you sure? arm does support suspend...
							Pavel

> --- 0001/arch/arm/include/asm/suspend.h
> +++ /dev/null	2009-05-12 09:34:44.497006305 +0900
> @@ -1,4 +0,0 @@
> -#ifndef _ASMARM_SUSPEND_H
> -#define _ASMARM_SUSPEND_H
> -
> -#endif

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH] pm: remove unused asm/suspend.h

[Magnus Damm]

Hi Pavel,

On Wed, May 13, 2009 at 4:32 AM, Pavel Machek <pavel@ucw.cz> wrote:
> On Tue 2009-05-12 22:16:06, Magnus Damm wrote:
>>
>> From: Magnus Damm <damm@igel.co.jp>
>>
>> This patch removes unused asm/suspend.h files for
>> the following architectures:
>>
>>  alpha, arm, ia64, m68k, mips, s390, um
>>
>> Signed-off-by: Magnus Damm <damm@igel.co.jp>
>
> Are you sure? arm does support suspend...

Not sure, but these days <asm/suspend.h> is only included from
kernel/power/disk.c. And that file is only built if CONFIG_HIBERNATION
is set. I've grepped for arch_prepare_suspend and
ARCH_HIBERNATION_POSSIBLE but I don't get any matches under
arch/arm...

Or am I misunderstanding? =)

Cheers,

/ magnus

Re: [PATCH] pm: remove unused asm/suspend.h

[Rafael J. Wysocki]

On Wednesday 13 May 2009, Magnus Damm wrote:
> Hi Pavel,
> 
> On Wed, May 13, 2009 at 4:32 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > On Tue 2009-05-12 22:16:06, Magnus Damm wrote:
> >>
> >> From: Magnus Damm <damm@igel.co.jp>
> >>
> >> This patch removes unused asm/suspend.h files for
> >> the following architectures:
> >>
> >>  alpha, arm, ia64, m68k, mips, s390, um
> >>
> >> Signed-off-by: Magnus Damm <damm@igel.co.jp>
> >
> > Are you sure? arm does support suspend...
> 
> Not sure, but these days <asm/suspend.h> is only included from
> kernel/power/disk.c. And that file is only built if CONFIG_HIBERNATION
> is set. I've grepped for arch_prepare_suspend and
> ARCH_HIBERNATION_POSSIBLE but I don't get any matches under
> arch/arm...
> 
> Or am I misunderstanding? =)

Sounds reasonable, but have you actually tested compilation on the
architectures you're changing?

Rafael

Re: [PATCH] pm: remove unused asm/suspend.h

[Magnus Damm]

On Wed, May 13, 2009 at 10:24 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Wednesday 13 May 2009, Magnus Damm wrote:
>> On Wed, May 13, 2009 at 4:32 AM, Pavel Machek <pavel@ucw.cz> wrote:
>> > On Tue 2009-05-12 22:16:06, Magnus Damm wrote:
>> >>
>> >> From: Magnus Damm <damm@igel.co.jp>
>> >>
>> >> This patch removes unused asm/suspend.h files for
>> >> the following architectures:
>> >>
>> >>  alpha, arm, ia64, m68k, mips, s390, um
>> >>
>> >> Signed-off-by: Magnus Damm <damm@igel.co.jp>
>> >
>> > Are you sure? arm does support suspend...
>>
>> Not sure, but these days <asm/suspend.h> is only included from
>> kernel/power/disk.c. And that file is only built if CONFIG_HIBERNATION
>> is set. I've grepped for arch_prepare_suspend and
>> ARCH_HIBERNATION_POSSIBLE but I don't get any matches under
>> arch/arm...
>>
>> Or am I misunderstanding? =)
>
> Sounds reasonable, but have you actually tested compilation on the
> architectures you're changing?

No, I have not. However, grepping shows that it's pretty safe:

$ find . | xargs grep asm/suspend

(files in arch/powerpc, arch/x86, arch/sh and kernel/power/disk.c)

Basically, the patch is doing further cleanups on top of:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a8af78982ff4c0b3731527b0217d286a343a3089

Since that patch is included upstream already it is safe to assume
that <asm/suspend.h> is only needed by architectures setting
ARCH_HIBERNATION_POSSIBLE. Which means powerpc, x86 and sh. The rest
of the header files can go away.

Still want me to compile test for all architectures affected?

Thanks,

/ magnus

Re: [PATCH] pm: remove unused asm/suspend.h

[Pavel Machek]

On Wed 2009-05-13 19:04:14, Magnus Damm wrote:
> Hi Pavel,
> 
> On Wed, May 13, 2009 at 4:32 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > On Tue 2009-05-12 22:16:06, Magnus Damm wrote:
> >>
> >> From: Magnus Damm <damm@igel.co.jp>
> >>
> >> This patch removes unused asm/suspend.h files for
> >> the following architectures:
> >>
> >>  alpha, arm, ia64, m68k, mips, s390, um
> >>
> >> Signed-off-by: Magnus Damm <damm@igel.co.jp>
> >
> > Are you sure? arm does support suspend...
> 
> Not sure, but these days <asm/suspend.h> is only included from
> kernel/power/disk.c. And that file is only built if CONFIG_HIBERNATION
> is set. I've grepped for arch_prepare_suspend and
> ARCH_HIBERNATION_POSSIBLE but I don't get any matches under
> arch/arm...
> 
> Or am I misunderstanding? =)

I did rm arch/arm/include/asm/suspend.h and ran test compile on
zaurus; it seems ok. Because no other architectures are close to
supporting suspend/hibernation, I think I can

Acked-by: Pavel Machek <pavel@ucw.cz>

									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: [PATCH] pm: remove unused asm/suspend.h

[Rafael J. Wysocki]

On Thursday 14 May 2009, Magnus Damm wrote:
> On Wed, May 13, 2009 at 10:24 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > On Wednesday 13 May 2009, Magnus Damm wrote:
> >> On Wed, May 13, 2009 at 4:32 AM, Pavel Machek <pavel@ucw.cz> wrote:
> >> > On Tue 2009-05-12 22:16:06, Magnus Damm wrote:
> >> >>
> >> >> From: Magnus Damm <damm@igel.co.jp>
> >> >>
> >> >> This patch removes unused asm/suspend.h files for
> >> >> the following architectures:
> >> >>
> >> >>  alpha, arm, ia64, m68k, mips, s390, um
> >> >>
> >> >> Signed-off-by: Magnus Damm <damm@igel.co.jp>
> >> >
> >> > Are you sure? arm does support suspend...
> >>
> >> Not sure, but these days <asm/suspend.h> is only included from
> >> kernel/power/disk.c. And that file is only built if CONFIG_HIBERNATION
> >> is set. I've grepped for arch_prepare_suspend and
> >> ARCH_HIBERNATION_POSSIBLE but I don't get any matches under
> >> arch/arm...
> >>
> >> Or am I misunderstanding? =)
> >
> > Sounds reasonable, but have you actually tested compilation on the
> > architectures you're changing?
> 
> No, I have not. However, grepping shows that it's pretty safe:
> 
> $ find . | xargs grep asm/suspend
> 
> (files in arch/powerpc, arch/x86, arch/sh and kernel/power/disk.c)
> 
> Basically, the patch is doing further cleanups on top of:
> 
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a8af78982ff4c0b3731527b0217d286a343a3089
> 
> Since that patch is included upstream already it is safe to assume
> that <asm/suspend.h> is only needed by architectures setting
> ARCH_HIBERNATION_POSSIBLE. Which means powerpc, x86 and sh. The rest
> of the header files can go away.
> 
> Still want me to compile test for all architectures affected?

No, thanks.

Best,
Rafael

Re: [PATCH] pm: remove unused asm/suspend.h

[Rafael J. Wysocki]

On Thursday 14 May 2009, Pavel Machek wrote:
> On Wed 2009-05-13 19:04:14, Magnus Damm wrote:
> > Hi Pavel,
> > 
> > On Wed, May 13, 2009 at 4:32 AM, Pavel Machek <pavel@ucw.cz> wrote:
> > > On Tue 2009-05-12 22:16:06, Magnus Damm wrote:
> > >>
> > >> From: Magnus Damm <damm@igel.co.jp>
> > >>
> > >> This patch removes unused asm/suspend.h files for
> > >> the following architectures:
> > >>
> > >>  alpha, arm, ia64, m68k, mips, s390, um
> > >>
> > >> Signed-off-by: Magnus Damm <damm@igel.co.jp>
> > >
> > > Are you sure? arm does support suspend...
> > 
> > Not sure, but these days <asm/suspend.h> is only included from
> > kernel/power/disk.c. And that file is only built if CONFIG_HIBERNATION
> > is set. I've grepped for arch_prepare_suspend and
> > ARCH_HIBERNATION_POSSIBLE but I don't get any matches under
> > arch/arm...
> > 
> > Or am I misunderstanding? =)
> 
> I did rm arch/arm/include/asm/suspend.h and ran test compile on
> zaurus; it seems ok. Because no other architectures are close to
> supporting suspend/hibernation, I think I can
> 
> Acked-by: Pavel Machek <pavel@ucw.cz>

Applied to the suspend tree.

Thanks,
Rafael