apm.c: get rid of unused variables

apm.c: get rid of unused variables

[Parag Warudkar]

The patch below (against latest git) gets rid of following unused 
variables - clock_cmos_diff and got_clock_diff.

2 less compiler warnings.

Compile tested on i386.

Signed-off-by: Parag Warudkar <parag.warudkar@gmail.com>

--- linux-2.6/arch/i386/kernel/apm.c	2007-03-24 21:43:35.000000000 -0400
+++ linux-2.6-wk/arch/i386/kernel/apm.c	2007-03-25 11:50:16.000000000 -0400
@@ -384,13 +384,6 @@
  static int			ignore_normal_resume;
  static int			bounce_interval __read_mostly = DEFAULT_BOUNCE_INTERVAL;

-#ifdef CONFIG_APM_RTC_IS_GMT
-#	define	clock_cmos_diff	0
-#	define	got_clock_diff	1
-#else
-static long			clock_cmos_diff;
-static int			got_clock_diff;
-#endif
  static int			debug __read_mostly;
  static int			smp __read_mostly;
  static int			apm_disabled = -1;

Re: apm.c: get rid of unused variables

[Adrian Bunk]

On Sun, Mar 25, 2007 at 12:06:19PM -0400, Parag Warudkar wrote:
> 
> The patch below (against latest git) gets rid of following unused 
> variables - clock_cmos_diff and got_clock_diff.
> 
> 2 less compiler warnings.
> 
> Compile tested on i386.
> 
> Signed-off-by: Parag Warudkar <parag.warudkar@gmail.com>
> 
> --- linux-2.6/arch/i386/kernel/apm.c	2007-03-24 21:43:35.000000000 -0400
> +++ linux-2.6-wk/arch/i386/kernel/apm.c	2007-03-25 
> 11:50:16.000000000 -0400
> @@ -384,13 +384,6 @@
>  static int			ignore_normal_resume;
>  static int			bounce_interval __read_mostly = 
>  DEFAULT_BOUNCE_INTERVAL;
> 
> -#ifdef CONFIG_APM_RTC_IS_GMT
> -#	define	clock_cmos_diff	0
> -#	define	got_clock_diff	1
> -#else
> -static long			clock_cmos_diff;
> -static int			got_clock_diff;
> -#endif
>  static int			debug __read_mostly;
>  static int			smp __read_mostly;
>  static int			apm_disabled = -1;

You could also remove the APM_RTC_IS_GMT config option.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: apm.c: get rid of unused variables

[Parag Warudkar]

[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]

On 3/25/07, Adrian Bunk <bunk@stusta.de> wrote:
> On Sun, Mar 25, 2007 at 12:06:19PM -0400, Parag Warudkar wrote:
> You could also remove the APM_RTC_IS_GMT config option.
>

Yep, that isn't used anymore. Separate Kconfig patch below and also attached.

Parag

Signed-off-by: Parag Warudkar <parag.warudkar@gmail.com>

--- linux-2.6/arch/i386/Kconfig 2007-03-24 21:43:35.000000000 -0400
+++ linux-2.6-wk/arch/i386/Kconfig      2007-03-25 12:58:18.000000000 -0400
@@ -1029,19 +1029,6 @@
          backlight at all, or it might print a lot of errors to the console,
          especially if you are using gpm.

-config APM_RTC_IS_GMT
-       bool "RTC stores time in GMT"
-       depends on APM
-       help
-         Say Y here if your RTC (Real Time Clock a.k.a. hardware clock)
-         stores the time in GMT (Greenwich Mean Time). Say N if your RTC
-         stores localtime.
-
-         It is in fact recommended to store GMT in your RTC, because then you
-         don't have to worry about daylight savings time changes. The only
-         reason not to use GMT in your RTC is if you also run a broken OS
-         that doesn't understand GMT.
-
 config APM_ALLOW_INTS
        bool "Allow interrupts during APM BIOS calls"
        depends on APM

[-- Attachment #2: i386-kconfig-remove-apm_rtc_is_gmt.patch --]
[-- Type: text/x-patch, Size: 846 bytes --]

--- linux-2.6/arch/i386/Kconfig	2007-03-24 21:43:35.000000000 -0400
+++ linux-2.6-wk/arch/i386/Kconfig	2007-03-25 12:58:18.000000000 -0400
@@ -1029,19 +1029,6 @@
 	  backlight at all, or it might print a lot of errors to the console,
 	  especially if you are using gpm.
 
-config APM_RTC_IS_GMT
-	bool "RTC stores time in GMT"
-	depends on APM
-	help
-	  Say Y here if your RTC (Real Time Clock a.k.a. hardware clock)
-	  stores the time in GMT (Greenwich Mean Time). Say N if your RTC
-	  stores localtime.
-
-	  It is in fact recommended to store GMT in your RTC, because then you
-	  don't have to worry about daylight savings time changes. The only
-	  reason not to use GMT in your RTC is if you also run a broken OS
-	  that doesn't understand GMT.
-
 config APM_ALLOW_INTS
 	bool "Allow interrupts during APM BIOS calls"
 	depends on APM

Re: apm.c: get rid of unused variables

[Andrew Morton]

On Sun, 25 Mar 2007 13:07:41 -0400 "Parag Warudkar" <parag.warudkar@gmail.com> wrote:

> Separate Kconfig patch below and also attached.

Please avoid sending two copies of a patch in the same email like this.

Because the result applies happily with `patch --dry-run' then makes a mess
when you try to apply it for real.