diff --git a/ChangeLog b/ChangeLog index 3b3ebd5ee..34b1a4a38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2009-05-04 Pavel Roskin + + * 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 * kern/ieee1275/openfw.c (grub_children_iterate): Fix string diff --git a/commands/acpi.c b/commands/acpi.c index 7b53343a6..d6dce376a 100644 --- 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 fde3011ff..568a8588c 100644 --- 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 - 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 2902f27d2..55d3cf585 100644 --- 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 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 683fcbace..ffdbed0f9 100644 --- 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 - 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 38aa75278..b86bb91fa 100644 --- a/partmap/pc.c +++ b/partmap/pc.c @@ -25,10 +25,6 @@ #include static struct grub_partition_map grub_pc_partition_map; - -#ifndef GRUB_UTIL -static grub_dl_t my_mod; -#endif /* 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 b05a2e2a3..6b524dbf0 100644 --- 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 4f74346b7..e6baa159f 100644 --- 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 884842895..7a81f644f 100644 --- 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 dd2e25c34..59c298375 100644 --- 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); }