From 4c402e73012b87ac946b2d63071b0c577884ecf6 Mon Sep 17 00:00:00 2001 From: proski Date: Mon, 4 May 2009 03:49:08 +0000 Subject: [PATCH] 2009-05-03 Pavel Roskin * disk/ata.c: Don't cast mod to void in GRUB_MOD_INIT to suppress warnings. It's no longer needed. * disk/host.c: Likewise. * disk/ata_pthru.c: Likewise. * disk/loopback.c: Likewise. * hook/datehook.c: Likewise. * parttool/pcpart.c: Likewise. * fs/i386/pc/pxe.c: Likewise. * fs/ntfscomp.c: Likewise. * efiemu/main.c: Likewise. * mmap/mmap.c: Likewise. * commands/crc.c: Likewise. * commands/hexdump.c: Likewise. * commands/hdparm.c: Likewise. * commands/acpi.c: Likewise. * commands/echo.c: Likewise. * commands/minicmd.c: Likewise. * commands/blocklist.c: Likewise. * commands/memrw.c: Likewise. * commands/loadenv.c: Likewise. * commands/usbtest.c: Likewise. * commands/lsmmap.c: Likewise. * commands/boot.c: Likewise. * commands/parttool.c: Likewise. * commands/configfile.c: Likewise. * commands/search.c: Likewise. * commands/ieee1275/suspend.c: Likewise. * commands/cat.c: Likewise. * commands/i386/pc/pxecmd.c: Likewise. * commands/i386/pc/play.c: Likewise. * commands/i386/pc/halt.c: Likewise. * commands/i386/pc/vbeinfo.c: Likewise. * commands/i386/pc/vbetest.c: Likewise. * commands/lspci.c: Likewise. * commands/date.c: Likewise. * commands/handler.c: Likewise. * commands/ls.c: Likewise. * commands/test.c: Likewise. * commands/cmp.c: Likewise. * commands/efi/loadbios.c: Likewise. * commands/efi/fixvideo.c: Likewise. * commands/halt.c: Likewise. * commands/help.c: Likewise. * commands/reboot.c: Likewise. * hello/hello.c: Likewise. * script/sh/main.c: Likewise. * loader/xnu.c: Likewise. * term/terminfo.c: Likewise. * term/i386/pc/serial.c: Likewise. * term/usb_keyboard.c: Likewise. --- ChangeLog | 53 +++++++++++++++++++++++++++++++++++++ commands/acpi.c | 1 - commands/blocklist.c | 1 - commands/boot.c | 1 - commands/cat.c | 1 - commands/cmp.c | 1 - commands/configfile.c | 1 - commands/crc.c | 1 - commands/date.c | 1 - commands/echo.c | 1 - commands/efi/fixvideo.c | 1 - commands/efi/loadbios.c | 1 - commands/halt.c | 1 - commands/handler.c | 1 - commands/hdparm.c | 2 -- commands/help.c | 1 - commands/hexdump.c | 1 - commands/i386/pc/halt.c | 1 - commands/i386/pc/play.c | 1 - commands/i386/pc/pxecmd.c | 1 - commands/i386/pc/vbeinfo.c | 1 - commands/i386/pc/vbetest.c | 1 - commands/ieee1275/suspend.c | 1 - commands/loadenv.c | 2 -- commands/ls.c | 1 - commands/lsmmap.c | 1 - commands/lspci.c | 1 - commands/memrw.c | 1 - commands/minicmd.c | 2 -- commands/parttool.c | 1 - commands/reboot.c | 1 - commands/search.c | 1 - commands/test.c | 1 - commands/usbtest.c | 1 - disk/ata.c | 2 -- disk/ata_pthru.c | 2 -- disk/host.c | 1 - disk/loopback.c | 1 - efiemu/main.c | 1 - fs/i386/pc/pxe.c | 2 -- fs/ntfscomp.c | 1 - hello/hello.c | 1 - hook/datehook.c | 1 - loader/xnu.c | 1 - mmap/mmap.c | 1 - parttool/pcpart.c | 2 -- script/sh/main.c | 1 - term/i386/pc/serial.c | 1 - term/terminfo.c | 1 - term/usb_keyboard.c | 2 -- 50 files changed, 53 insertions(+), 57 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61c89671a..2f7d7908b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +2009-05-03 Pavel Roskin + + * disk/ata.c: Don't cast mod to void in GRUB_MOD_INIT to + suppress warnings. It's no longer needed. + * disk/host.c: Likewise. + * disk/ata_pthru.c: Likewise. + * disk/loopback.c: Likewise. + * hook/datehook.c: Likewise. + * parttool/pcpart.c: Likewise. + * fs/i386/pc/pxe.c: Likewise. + * fs/ntfscomp.c: Likewise. + * efiemu/main.c: Likewise. + * mmap/mmap.c: Likewise. + * commands/crc.c: Likewise. + * commands/hexdump.c: Likewise. + * commands/hdparm.c: Likewise. + * commands/acpi.c: Likewise. + * commands/echo.c: Likewise. + * commands/minicmd.c: Likewise. + * commands/blocklist.c: Likewise. + * commands/memrw.c: Likewise. + * commands/loadenv.c: Likewise. + * commands/usbtest.c: Likewise. + * commands/lsmmap.c: Likewise. + * commands/boot.c: Likewise. + * commands/parttool.c: Likewise. + * commands/configfile.c: Likewise. + * commands/search.c: Likewise. + * commands/ieee1275/suspend.c: Likewise. + * commands/cat.c: Likewise. + * commands/i386/pc/pxecmd.c: Likewise. + * commands/i386/pc/play.c: Likewise. + * commands/i386/pc/halt.c: Likewise. + * commands/i386/pc/vbeinfo.c: Likewise. + * commands/i386/pc/vbetest.c: Likewise. + * commands/lspci.c: Likewise. + * commands/date.c: Likewise. + * commands/handler.c: Likewise. + * commands/ls.c: Likewise. + * commands/test.c: Likewise. + * commands/cmp.c: Likewise. + * commands/efi/loadbios.c: Likewise. + * commands/efi/fixvideo.c: Likewise. + * commands/halt.c: Likewise. + * commands/help.c: Likewise. + * commands/reboot.c: Likewise. + * hello/hello.c: Likewise. + * script/sh/main.c: Likewise. + * loader/xnu.c: Likewise. + * term/terminfo.c: Likewise. + * term/i386/pc/serial.c: Likewise. + * term/usb_keyboard.c: Likewise. + 2009-05-03 David S. Miller * normal/menu.c: Include grub/parser.h diff --git a/commands/acpi.c b/commands/acpi.c index 309228827..3521c4c54 100644 --- a/commands/acpi.c +++ b/commands/acpi.c @@ -756,7 +756,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(acpi) { - (void) mod; /* To stop warning. */ cmd = grub_register_extcmd ("acpi", grub_cmd_acpi, GRUB_COMMAND_FLAG_BOTH, "acpi [-1|-2] [--exclude=table1,table2|" diff --git a/commands/blocklist.c b/commands/blocklist.c index b8c538544..2057291af 100644 --- a/commands/blocklist.c +++ b/commands/blocklist.c @@ -109,7 +109,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(blocklist) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("blocklist", grub_cmd_blocklist, "blocklist FILE", "Print a block list."); } diff --git a/commands/boot.c b/commands/boot.c index c8bd030a0..40ee9f8c4 100644 --- a/commands/boot.c +++ b/commands/boot.c @@ -184,7 +184,6 @@ static grub_command_t cmd_boot; GRUB_MOD_INIT(boot) { - (void) mod; /* To stop warning. */ cmd_boot = grub_register_command ("boot", grub_cmd_boot, 0, "boot an operating system"); diff --git a/commands/cat.c b/commands/cat.c index 786113ec4..f2d5f1c1a 100644 --- a/commands/cat.c +++ b/commands/cat.c @@ -77,7 +77,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(cat) { - (void) mod; /* To stop warning. */ cmd = grub_register_command_p1 ("cat", grub_cmd_cat, "cat FILE", "Show the contents of a file."); } diff --git a/commands/cmp.c b/commands/cmp.c index c70690a63..b5d4f8dac 100644 --- a/commands/cmp.c +++ b/commands/cmp.c @@ -108,7 +108,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(cmp) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("cmp", grub_cmd_cmp, "cmp FILE1 FILE2", "Compare two files."); } diff --git a/commands/configfile.c b/commands/configfile.c index 37d02b6b8..852932216 100644 --- a/commands/configfile.c +++ b/commands/configfile.c @@ -51,7 +51,6 @@ static grub_command_t cmd_configfile, cmd_source, cmd_dot; GRUB_MOD_INIT(configfile) { - (void) mod; /* To stop warning. */ cmd_configfile = grub_register_command ("configfile", grub_cmd_source, "configfile FILE", "Load another config file."); diff --git a/commands/crc.c b/commands/crc.c index 71a0c065c..6b4b1d1b5 100644 --- a/commands/crc.c +++ b/commands/crc.c @@ -56,7 +56,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(crc) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("crc", grub_cmd_crc, "crc FILE", "Calculate the crc32 checksum of a file."); diff --git a/commands/date.c b/commands/date.c index a8f19b305..1d609642e 100644 --- a/commands/date.c +++ b/commands/date.c @@ -133,7 +133,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(date) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("date", grub_cmd_date, "date [[year-]month-day] [hour:minute[:second]]", diff --git a/commands/echo.c b/commands/echo.c index 55181430c..f3b5f873d 100644 --- a/commands/echo.c +++ b/commands/echo.c @@ -112,7 +112,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(echo) { - (void) mod; /* To stop warning. */ cmd = grub_register_extcmd ("echo", grub_cmd_echo, GRUB_COMMAND_FLAG_BOTH, "echo [-e|-n] FILE", "Display a line of text.", options); diff --git a/commands/efi/fixvideo.c b/commands/efi/fixvideo.c index 013c1eec6..f97d83787 100644 --- a/commands/efi/fixvideo.c +++ b/commands/efi/fixvideo.c @@ -98,7 +98,6 @@ static grub_command_t cmd_fixvideo; GRUB_MOD_INIT(fixvideo) { - (void) mod; /* To stop warning. */ cmd_fixvideo = grub_register_command ("fix_video", grub_cmd_fixvideo, 0, "Fix video problem."); diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c index a0f314931..7b71a712d 100644 --- a/commands/efi/loadbios.c +++ b/commands/efi/loadbios.c @@ -198,7 +198,6 @@ static grub_command_t cmd_fakebios, cmd_loadbios; GRUB_MOD_INIT(loadbios) { - (void) mod; /* To stop warning. */ cmd_fakebios = grub_register_command ("fakebios", grub_cmd_fakebios, 0, "fake bios."); diff --git a/commands/halt.c b/commands/halt.c index 0ae2b36bd..b902418a8 100644 --- a/commands/halt.c +++ b/commands/halt.c @@ -43,7 +43,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(halt) { - (void)mod; /* To stop warning. */ cmd = grub_register_command ("halt", grub_cmd_halt, 0, "halts the computer. This command does not" " work on all firmware."); diff --git a/commands/handler.c b/commands/handler.c index d9ed61185..2070c391c 100644 --- a/commands/handler.c +++ b/commands/handler.c @@ -93,7 +93,6 @@ static grub_command_t cmd_handler, cmd_terminal_input, cmd_terminal_output; GRUB_MOD_INIT(handler) { - (void)mod; /* To stop warning. */ cmd_handler = grub_register_command ("handler", grub_cmd_handler, "handler [class [handler]]", diff --git a/commands/hdparm.c b/commands/hdparm.c index 8dcd6c256..389954c45 100644 --- a/commands/hdparm.c +++ b/commands/hdparm.c @@ -408,8 +408,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(hdparm) { - (void) mod; - cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm, GRUB_COMMAND_FLAG_BOTH, "hdparm [OPTIONS] DISK", diff --git a/commands/help.c b/commands/help.c index 02b841d05..6159a6333 100644 --- a/commands/help.c +++ b/commands/help.c @@ -92,7 +92,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(help) { - (void)mod; /* To stop warning. */ cmd = grub_register_extcmd ("help", grub_cmd_help, GRUB_COMMAND_FLAG_CMDLINE, "help [PATTERN ...]", diff --git a/commands/hexdump.c b/commands/hexdump.c index c4b7d323d..0e560c0ff 100644 --- a/commands/hexdump.c +++ b/commands/hexdump.c @@ -125,7 +125,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT (hexdump) { - (void) mod; /* To stop warning. */ cmd = grub_register_extcmd ("hexdump", grub_cmd_hexdump, GRUB_COMMAND_FLAG_BOTH, "hexdump [OPTIONS] FILE_OR_DEVICE", diff --git a/commands/i386/pc/halt.c b/commands/i386/pc/halt.c index 8999f5aac..add8631a8 100644 --- a/commands/i386/pc/halt.c +++ b/commands/i386/pc/halt.c @@ -45,7 +45,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(halt) { - (void)mod; /* To stop warning. */ cmd = grub_register_extcmd ("halt", grub_cmd_halt, GRUB_COMMAND_FLAG_BOTH, "halt [-n]", "Halt the system, if possible using APM", diff --git a/commands/i386/pc/play.c b/commands/i386/pc/play.c index 40ab81c0c..f9512cee5 100644 --- a/commands/i386/pc/play.c +++ b/commands/i386/pc/play.c @@ -206,7 +206,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(play) { - (void)mod; /* To stop warning. */ cmd = grub_register_command ("play", grub_cmd_play, "play FILE", "Play a tune"); } diff --git a/commands/i386/pc/pxecmd.c b/commands/i386/pc/pxecmd.c index 7a2e9e907..df538704c 100644 --- a/commands/i386/pc/pxecmd.c +++ b/commands/i386/pc/pxecmd.c @@ -88,7 +88,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(pxecmd) { - (void) mod; /* To stop warning. */ cmd = grub_register_extcmd ("pxe", grub_cmd_pxe, GRUB_COMMAND_FLAG_BOTH, "pxe [-i|-b|-u]", "Command to control the PXE device.", options); diff --git a/commands/i386/pc/vbeinfo.c b/commands/i386/pc/vbeinfo.c index bf26689f0..3c397a14d 100644 --- a/commands/i386/pc/vbeinfo.c +++ b/commands/i386/pc/vbeinfo.c @@ -173,7 +173,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(vbeinfo) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("vbeinfo", grub_cmd_vbeinfo, 0, "List compatible VESA BIOS extension video modes."); diff --git a/commands/i386/pc/vbetest.c b/commands/i386/pc/vbetest.c index f47383065..bfcf215d0 100644 --- a/commands/i386/pc/vbetest.c +++ b/commands/i386/pc/vbetest.c @@ -165,7 +165,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(vbetest) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("vbetest", grub_cmd_vbetest, 0, "Test VESA BIOS Extension 2.0+ support"); } diff --git a/commands/ieee1275/suspend.c b/commands/ieee1275/suspend.c index 01e132441..028dd3cd8 100644 --- a/commands/ieee1275/suspend.c +++ b/commands/ieee1275/suspend.c @@ -38,7 +38,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(ieee1275_suspend) { - (void)mod; /* To stop warning. */ cmd = grub_register_command ("suspend", grub_cmd_suspend, 0, "Return to Open Firmware prompt"); } diff --git a/commands/loadenv.c b/commands/loadenv.c index e7d1b06e4..1c2020b30 100644 --- a/commands/loadenv.c +++ b/commands/loadenv.c @@ -381,8 +381,6 @@ static grub_extcmd_t cmd_load, cmd_list, cmd_save; GRUB_MOD_INIT(loadenv) { - (void) mod; - cmd_load = grub_register_extcmd ("load_env", grub_cmd_load_env, GRUB_COMMAND_FLAG_BOTH, diff --git a/commands/ls.c b/commands/ls.c index 8e4d2a285..fb38fab99 100644 --- a/commands/ls.c +++ b/commands/ls.c @@ -259,7 +259,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(ls) { - (void)mod; /* To stop warning. */ cmd = grub_register_extcmd ("ls", grub_cmd_ls, GRUB_COMMAND_FLAG_BOTH, "ls [-l|-h|-a] [FILE]", "List devices and files.", options); diff --git a/commands/lsmmap.c b/commands/lsmmap.c index 4fe9a5a7a..09f141ea0 100644 --- a/commands/lsmmap.c +++ b/commands/lsmmap.c @@ -42,7 +42,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(lsmmap) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("lsmmap", grub_cmd_lsmmap, 0, "List memory map provided by firmware."); } diff --git a/commands/lspci.c b/commands/lspci.c index 36bc7608f..5b3360a37 100644 --- a/commands/lspci.c +++ b/commands/lspci.c @@ -158,7 +158,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(pci) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("lspci", grub_cmd_lspci, 0, "List PCI devices"); } diff --git a/commands/memrw.c b/commands/memrw.c index fa04c7609..adffb7fc8 100644 --- a/commands/memrw.c +++ b/commands/memrw.c @@ -69,7 +69,6 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv) GRUB_MOD_INIT(memrw) { - (void) mod; /* To stop warning. */ cmd_read_byte = grub_register_command ("read_byte", grub_cmd_read, "read_byte ADDR", "read byte."); diff --git a/commands/minicmd.c b/commands/minicmd.c index 5083291f4..b31438844 100644 --- a/commands/minicmd.c +++ b/commands/minicmd.c @@ -341,8 +341,6 @@ static grub_command_t cmd_dump, cmd_rmmod, cmd_lsmod, cmd_exit; GRUB_MOD_INIT(minicmd) { - (void) mod; /* To stop warning. */ - cmd_cat = grub_register_command ("cat", grub_mini_cmd_cat, "cat FILE", "show the contents of a file"); diff --git a/commands/parttool.c b/commands/parttool.c index b09a2bac0..b4cbf0051 100644 --- a/commands/parttool.c +++ b/commands/parttool.c @@ -327,7 +327,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(parttool) { - (void)mod; /* To stop warning. */ mymod = mod; cmd = grub_register_command ("parttool", grub_cmd_parttool, "parttool PARTITION COMMANDS", diff --git a/commands/reboot.c b/commands/reboot.c index b5b42cde1..11bceeb31 100644 --- a/commands/reboot.c +++ b/commands/reboot.c @@ -46,7 +46,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(reboot) { - (void)mod; /* To stop warning. */ cmd = grub_register_command ("reboot", grub_cmd_reboot, 0, "Reboot the computer"); } diff --git a/commands/search.c b/commands/search.c index ccf4d16fc..03884a9f2 100644 --- a/commands/search.c +++ b/commands/search.c @@ -220,7 +220,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(search) { - (void) mod; /* To stop warning. */ cmd = grub_register_extcmd ("search", grub_cmd_search, GRUB_COMMAND_FLAG_BOTH, diff --git a/commands/test.c b/commands/test.c index 46ee03f1c..68b5efede 100644 --- a/commands/test.c +++ b/commands/test.c @@ -412,7 +412,6 @@ static grub_command_t cmd_1, cmd_2; GRUB_MOD_INIT(test) { - (void)mod; /* To stop warning. */ cmd_1 = grub_register_command ("[", grub_cmd_test, "[ EXPRESSION ]", "Evaluate an expression"); cmd_2 = grub_register_command ("test", grub_cmd_test, diff --git a/commands/usbtest.c b/commands/usbtest.c index c05173ea8..019d3fe78 100644 --- a/commands/usbtest.c +++ b/commands/usbtest.c @@ -151,7 +151,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(usbtest) { - (void)mod; /* To stop warning. */ cmd = grub_register_command ("usb", grub_cmd_usbtest, 0, "Test USB support"); } diff --git a/disk/ata.c b/disk/ata.c index fe6372011..812537ebe 100644 --- a/disk/ata.c +++ b/disk/ata.c @@ -835,8 +835,6 @@ static struct grub_scsi_dev grub_atapi_dev = GRUB_MOD_INIT(ata) { - (void) mod; /* To stop warning. */ - /* To prevent two drivers operating on the same disks. */ grub_disk_firmware_is_tainted = 1; if (grub_disk_firmware_fini) diff --git a/disk/ata_pthru.c b/disk/ata_pthru.c index cc74eb41b..70d4f3a78 100644 --- a/disk/ata_pthru.c +++ b/disk/ata_pthru.c @@ -96,8 +96,6 @@ grub_ata_pass_through (grub_disk_t disk, GRUB_MOD_INIT(ata_pthru) { - (void) mod; - /* Register ATA pass through function. */ grub_disk_ata_pass_through = grub_ata_pass_through; } diff --git a/disk/host.c b/disk/host.c index bb8828a6c..0229278f4 100644 --- a/disk/host.c +++ b/disk/host.c @@ -87,7 +87,6 @@ static struct grub_disk_dev grub_host_dev = GRUB_MOD_INIT(host) { - (void) mod; /* To stop warning. */ grub_disk_dev_register (&grub_host_dev); } diff --git a/disk/loopback.c b/disk/loopback.c index d41a78301..3cb2bf0ab 100644 --- a/disk/loopback.c +++ b/disk/loopback.c @@ -243,7 +243,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(loop) { - (void) mod; /* To stop warning. */ cmd = grub_register_extcmd ("loopback", grub_cmd_loopback, GRUB_COMMAND_FLAG_BOTH, "loopback [-d|-p] DEVICENAME FILE", diff --git a/efiemu/main.c b/efiemu/main.c index c4144390e..e11d7c3f9 100644 --- a/efiemu/main.c +++ b/efiemu/main.c @@ -321,7 +321,6 @@ grub_efiemu_pnvram_cmd_register (void); GRUB_MOD_INIT(efiemu) { - (void) mod; /* To stop warning. */ cmd_loadcore = grub_register_command ("efiemu_loadcore", grub_cmd_efiemu_load, "efiemu_loadcore FILE", diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c index f294b89fa..9676be42c 100644 --- a/fs/i386/pc/pxe.c +++ b/fs/i386/pc/pxe.c @@ -305,8 +305,6 @@ grub_pxe_unload (void) GRUB_MOD_INIT(pxe) { - (void) mod; /* To stop warning. */ - grub_pxe_detect (); if (grub_pxe_pxenv) { diff --git a/fs/ntfscomp.c b/fs/ntfscomp.c index db8b50621..b021c358f 100644 --- a/fs/ntfscomp.c +++ b/fs/ntfscomp.c @@ -365,7 +365,6 @@ quit: GRUB_MOD_INIT (ntfscomp) { - (void) mod; grub_ntfscomp_func = ntfscomp; } diff --git a/hello/hello.c b/hello/hello.c index e3cf3212c..be60761ec 100644 --- a/hello/hello.c +++ b/hello/hello.c @@ -38,7 +38,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(hello) { - (void)mod; /* To stop warning. */ cmd = grub_register_extcmd ("hello", grub_cmd_hello, GRUB_COMMAND_FLAG_BOTH, "hello", "Say hello", 0); } diff --git a/hook/datehook.c b/hook/datehook.c index 0b0332871..b7663cc21 100644 --- a/hook/datehook.c +++ b/hook/datehook.c @@ -86,7 +86,6 @@ grub_read_hook_datetime (struct grub_env_var *var, GRUB_MOD_INIT(datetime) { - (void)mod; /* To stop warning. */ int i; for (i = 0; i < 7; i++) diff --git a/loader/xnu.c b/loader/xnu.c index d8af485c1..45696ee5f 100644 --- a/loader/xnu.c +++ b/loader/xnu.c @@ -1328,7 +1328,6 @@ static grub_command_t cmd_kernel, cmd_mkext, cmd_kext, cmd_kextdir, GRUB_MOD_INIT(xnu) { - (void) mod; /* To stop warning. */ cmd_kernel = grub_register_command ("xnu_kernel", grub_cmd_xnu_kernel, 0, "load a xnu kernel"); cmd_mkext = grub_register_command ("xnu_mkext", grub_cmd_xnu_mkext, 0, diff --git a/mmap/mmap.c b/mmap/mmap.c index 1d82db7f0..86df28b1d 100644 --- a/mmap/mmap.c +++ b/mmap/mmap.c @@ -413,7 +413,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(mmap) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("badram", grub_cmd_badram, "badram ADDR1,MASK1[,ADDR2,MASK2[,...]]", "declare memory regions as badram"); diff --git a/parttool/pcpart.c b/parttool/pcpart.c index a2b9452d9..8ada0ec25 100644 --- a/parttool/pcpart.c +++ b/parttool/pcpart.c @@ -140,8 +140,6 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev, GRUB_MOD_INIT (pcpart) { - (void)mod; /* To stop warning. */ - activate_table_handle = grub_parttool_register ("pc_partition_map", grub_pcpart_boot, grub_pcpart_bootargs); diff --git a/script/sh/main.c b/script/sh/main.c index d4e342c71..4eefafa18 100644 --- a/script/sh/main.c +++ b/script/sh/main.c @@ -48,7 +48,6 @@ static struct grub_parser grub_sh_parser = GRUB_MOD_INIT(sh) { - (void) mod; grub_parser_register ("sh", &grub_sh_parser); } diff --git a/term/i386/pc/serial.c b/term/i386/pc/serial.c index 757a06cb4..ec4d61506 100644 --- a/term/i386/pc/serial.c +++ b/term/i386/pc/serial.c @@ -607,7 +607,6 @@ static grub_extcmd_t cmd; GRUB_MOD_INIT(serial) { - (void) mod; /* To stop warning. */ cmd = grub_register_extcmd ("serial", grub_cmd_serial, GRUB_COMMAND_FLAG_BOTH, "serial [OPTIONS...]", diff --git a/term/terminfo.c b/term/terminfo.c index 45dcef7e0..f18be9ef0 100644 --- a/term/terminfo.c +++ b/term/terminfo.c @@ -177,7 +177,6 @@ static grub_command_t cmd; GRUB_MOD_INIT(terminfo) { - (void) mod; /* To stop warning. */ cmd = grub_register_command ("terminfo", grub_cmd_terminfo, "terminfo [TERM]", "Set terminfo type."); grub_terminfo_set_current ("vt100"); diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c index 50bbdd433..4a5d75bcf 100644 --- a/term/usb_keyboard.c +++ b/term/usb_keyboard.c @@ -244,8 +244,6 @@ static struct grub_term_input grub_usb_keyboard_term = GRUB_MOD_INIT(usb_keyboard) { - (void) mod; /* To stop warning. */ - grub_usb_hid (); grub_term_register_input ("usb_keyboard", &grub_usb_keyboard_term); }