2009-05-04 Pavel Roskin <proski@gnu.org>

	* commands/acpi.c: Remove unused variable my_mod.
	* partmap/amiga.c: Likewise.
	* partmap/apple.c: Likewise.
	* partmap/gpt.c: Likewise.
	* partmap/pc.c: Likewise.
	* partmap/sun.c: Likewise.
	* term/gfxterm.c: Likewise.
	* term/i386/pc/vesafb.c: Likewise.
	* term/i386/pc/vga.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3b3ebd5eed0ed4c650b39b7bb61d4cb88e27ccac..34b1a4a3819abd519f19c550f4db5f82053c7aec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-05-04  Pavel Roskin  <proski@gnu.org>
+
+       * commands/acpi.c: Remove unused variable my_mod.
+       * partmap/amiga.c: Likewise.
+       * partmap/apple.c: Likewise.
+       * partmap/gpt.c: Likewise.
+       * partmap/pc.c: Likewise.
+       * partmap/sun.c: Likewise.
+       * term/gfxterm.c: Likewise.
+       * term/i386/pc/vesafb.c: Likewise.
+       * term/i386/pc/vga.c: Likewise.
+
 2009-05-04  David S. Miller  <davem@davemloft.net>
 
        * kern/ieee1275/openfw.c (grub_children_iterate): Fix string

diff --git a/commands/acpi.c b/commands/acpi.c
index 7b53343a69105f2a85ef272bcf31506334044dc9..d6dce376a370f4b37a3fb0f4da3dd42535f011cf 100644 (file)
--- a/commands/acpi.c
+++ b/commands/acpi.c
@@ -73,7 +73,6 @@ grub_byte_checksum (void *base, grub_size_t size)
 /* rev1 is 1 if ACPIv1 is to be generated, 0 otherwise. 
    rev2 contains the revision of ACPIv2+ to generate or 0 if none. */
 static int rev1, rev2;
-static grub_dl_t my_mod;
 /* OEMID of RSDP, RSDT and XSDT. */
 static char root_oemid[6];
 /* OEMTABLE of the same tables. */
@@ -764,7 +763,6 @@ GRUB_MOD_INIT(acpi)
                              "Load host acpi tables and tables "
                              "specified by arguments", 
                              options);
-  my_mod=mod;
 }
 
 GRUB_MOD_FINI(acpi)

diff --git a/partmap/amiga.c b/partmap/amiga.c
index fde3011ff600839c66fe900e9a5fcf5ceab4e699..568a8588cd76bdac841e87955e655e1c4fe97efb 100644 (file)
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -67,10 +67,6 @@ struct grub_amiga_partition
 
 static struct grub_partition_map grub_amiga_partition_map;
 
-#ifndef GRUB_UTIL
-static grub_dl_t my_mod;
-#endif
-
 \f
 
 static grub_err_t
@@ -211,9 +207,6 @@ static struct grub_partition_map grub_amiga_partition_map =
 GRUB_MOD_INIT(amiga_partition_map)
 {
   grub_partition_map_register (&grub_amiga_partition_map);
-#ifndef GRUB_UTIL
-  my_mod = mod;
-#endif
 }
 
 GRUB_MOD_FINI(amiga_partition_map)

diff --git a/partmap/apple.c b/partmap/apple.c
index 2902f27d27f685fcd75bea172c087d02318f0a64..55d3cf585e6ab3ba4572f10276fd4bc3c1d89dbc 100644 (file)
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -94,10 +94,6 @@ struct grub_apple_part
 };
 
 static struct grub_partition_map grub_apple_partition_map;
-
-#ifndef GRUB_UTIL
-static grub_dl_t my_mod;
-#endif
 \f
 
 static grub_err_t
@@ -247,9 +243,6 @@ static struct grub_partition_map grub_apple_partition_map =
 GRUB_MOD_INIT(apple_partition_map)
 {
   grub_partition_map_register (&grub_apple_partition_map);
-#ifndef GRUB_UTIL
-  my_mod = mod;
-#endif
 }
 
 GRUB_MOD_FINI(apple_partition_map)

diff --git a/partmap/gpt.c b/partmap/gpt.c
index 683fcbacee793df3848e96c04b11372b3420af48..ffdbed0f9dc13bf73e05d97683879ae0295ccc38 100644 (file)
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -34,10 +34,6 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_empty = GRUB_GPT_PARTI
 
 static struct grub_partition_map grub_gpt_partition_map;
 
-#ifndef GRUB_UTIL
-static grub_dl_t my_mod;
-#endif
-
 \f
 
 static grub_err_t
@@ -189,9 +185,6 @@ static struct grub_partition_map grub_gpt_partition_map =
 GRUB_MOD_INIT(gpt_partition_map)
 {
   grub_partition_map_register (&grub_gpt_partition_map);
-#ifndef GRUB_UTIL
-  my_mod = mod;
-#endif
 }
 
 GRUB_MOD_FINI(gpt_partition_map)

diff --git a/partmap/pc.c b/partmap/pc.c
index 38aa752786304f13dbed7a8dd92b4088ad7dfa47..b86bb91fafb9b6a83d72ce79347a2106971164b5 100644 (file)
--- a/partmap/pc.c
+++ b/partmap/pc.c
@@ -25,10 +25,6 @@
 #include <grub/dl.h>
 
 static struct grub_partition_map grub_pc_partition_map;
-
-#ifndef GRUB_UTIL
-static grub_dl_t my_mod;
-#endif
 \f
 
 /* Parse the partition representation in STR and return a partition.  */
@@ -312,9 +308,6 @@ static struct grub_partition_map grub_pc_partition_map =
 GRUB_MOD_INIT(pc_partition_map)
 {
   grub_partition_map_register (&grub_pc_partition_map);
-#ifndef GRUB_UTIL
-  my_mod = mod;
-#endif
 }
 
 GRUB_MOD_FINI(pc_partition_map)

diff --git a/partmap/sun.c b/partmap/sun.c
index b05a2e2a30012eaeaeb0013cb29839509eae3989..6b524dbf03938df593ba417319a14fa72b86935e 100644 (file)
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -67,10 +67,6 @@ struct grub_sun_block
 
 static struct grub_partition_map grub_sun_partition_map;
 
-#ifndef GRUB_UTIL
-static grub_dl_t my_mod;
-#endif
-
 /* Verify checksum (true=ok).  */
 static int
 grub_sun_is_valid (struct grub_sun_block *label)
@@ -211,9 +207,6 @@ static struct grub_partition_map grub_sun_partition_map =
 GRUB_MOD_INIT(sun_partition_map)
 {
   grub_partition_map_register (&grub_sun_partition_map);
-#ifndef GRUB_UTIL
-  my_mod = mod;
-#endif
 }
 
 GRUB_MOD_FINI(sun_partition_map)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index 4f74346b7bd7bfa5ca4da2a0f4945f9c958ede2c..e6baa159f965ca64ce3177eb69b233319639c96a 100644 (file)
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -106,7 +106,6 @@ struct grub_virtual_screen
 
 static struct grub_virtual_screen virtual_screen;
 
-static grub_dl_t my_mod;
 static struct grub_video_mode_info mode_info;
 
 static struct grub_video_render_target *text_layer;
@@ -1154,7 +1153,6 @@ static grub_command_t cmd;
 
 GRUB_MOD_INIT(term_gfxterm)
 {
-  my_mod = mod;
   grub_term_register_output ("gfxterm", &grub_video_term);
   cmd = grub_register_command ("background_image",
                               grub_gfxterm_background_image_cmd,

diff --git a/term/i386/pc/vesafb.c b/term/i386/pc/vesafb.c
index 88484289535de3754b0c6b3ad52ad02a79f5c3a3..7a81f644f68e0f65899abf83fff769b766268b9e 100644 (file)
--- a/term/i386/pc/vesafb.c
+++ b/term/i386/pc/vesafb.c
@@ -89,7 +89,6 @@ static struct grub_virtual_screen virtual_screen =
     .text_buffer = 0
   };
 
-static grub_dl_t my_mod;
 static unsigned char *vga_font = 0;
 static grub_uint32_t old_mode = 0;
 
@@ -598,7 +597,6 @@ static struct grub_term_output grub_vesafb_term =
 
 GRUB_MOD_INIT(vesafb)
 {
-  my_mod = mod;
   grub_term_register_output ("vesafb", &grub_vesafb_term);
 }
 

diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index dd2e25c34a7ca7a48e512ae6383564bd9aeefa1b..59c298375c02ac023ad44e9542fb7dd098a24c93 100644 (file)
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -57,7 +57,6 @@ struct colored_char
   unsigned char index;
 };
 
-static grub_dl_t my_mod;
 static unsigned char text_mode;
 static unsigned xpos, ypos;
 static int cursor_state;
@@ -505,9 +504,6 @@ static struct grub_term_output grub_vga_term =
 
 GRUB_MOD_INIT(vga)
 {
-#ifndef GRUB_UTIL
-  my_mod = mod;
-#endif
   grub_term_register_output ("vga", &grub_vga_term);
 }