kill long dead argument

the "Additional Drivers floppy" is long dead

13 files changed, 55 insertions, 55 deletions

diff --git a/mdk-stage1/adsl.c b/mdk-stage1/adsl.c
index 59301e82d..70968f50b 100644
--- a/mdk-stage1/adsl.c
+++ b/mdk-stage1/adsl.c
@@ -156,8 +156,8 @@ enum return_type perform_adsl(struct interface_info * intf)
 	intf->boot_proto = BOOTPROTO_ADSL_PPPOE;
 
 	wait_message("Waiting for ADSL connection to show up...");
-	my_modprobe("ppp_generic", ANY_DRIVER_TYPE, NULL, 1);
-	my_modprobe("ppp_async", ANY_DRIVER_TYPE, NULL, 1);
+	my_modprobe("ppp_generic", ANY_DRIVER_TYPE, NULL);
+	my_modprobe("ppp_async", ANY_DRIVER_TYPE, NULL);
 	results = adsl_connect(intf, answers[0], answers[1], answers[2]);
 	remove_wait_message();
 
diff --git a/mdk-stage1/cdrom.c b/mdk-stage1/cdrom.c
index dac422173..71db1da16 100644
--- a/mdk-stage1/cdrom.c
+++ b/mdk-stage1/cdrom.c
@@ -138,7 +138,7 @@ enum return_type cdrom_prepare(void)
 	enum return_type results;
 	static int already_probed_ide_generic = 0;
 
-	my_modprobe("ide_cd_mod", ANY_DRIVER_TYPE, NULL, 0);
+	my_modprobe("ide_cd_mod", ANY_DRIVER_TYPE, NULL);
 
 	if (IS_AUTOMATIC) {
 		get_medias(CDROM, &medias, &medias_models, BUS_IDE);
@@ -149,7 +149,7 @@ enum return_type cdrom_prepare(void)
 		if ((i = try_automatic(medias, medias_models)) != -1)
 			return do_with_device(medias[i], medias_models[i]);
 		
-		my_modprobe("sr_mod", ANY_DRIVER_TYPE, NULL, 0);
+		my_modprobe("sr_mod", ANY_DRIVER_TYPE, NULL);
 		get_medias(CDROM, &medias, &medias_models, BUS_SCSI);
 		if ((i = try_automatic(medias, medias_models)) != -1)
 			return do_with_device(medias[i], medias_models[i]);
@@ -159,7 +159,7 @@ enum return_type cdrom_prepare(void)
 			return do_with_device(medias[i], medias_models[i]);
 
 		/* detect hybrid isos (isos dumped to an USB stick) */
-		my_modprobe("sd_mod", ANY_DRIVER_TYPE, NULL, 0);
+		my_modprobe("sd_mod", ANY_DRIVER_TYPE, NULL);
 		get_medias(DISK, &medias, &medias_models, BUS_USB);
 		if ((i = try_automatic(medias, medias_models)) != -1) {
 			return do_with_device(medias[i], medias_models[i]);
@@ -167,7 +167,7 @@ enum return_type cdrom_prepare(void)
 
 		unset_automatic();
 	} else
-		my_modprobe("sr_mod", ANY_DRIVER_TYPE, NULL, 0);
+		my_modprobe("sr_mod", ANY_DRIVER_TYPE, NULL);
 
 
 	get_medias(CDROM, &medias, &medias_models, BUS_ANY);
@@ -180,7 +180,7 @@ enum return_type cdrom_prepare(void)
 	if (count == 0) {
 		if (!already_probed_ide_generic) {
 			already_probed_ide_generic = 1;
-			my_modprobe("ide_generic", ANY_DRIVER_TYPE, NULL, 0);
+			my_modprobe("ide_generic", ANY_DRIVER_TYPE, NULL);
 			return cdrom_prepare();
 		}
 		stg1_error_message("No CDROM device found.");
diff --git a/mdk-stage1/disk.c b/mdk-stage1/disk.c
index b72a5c212..d9fd92b99 100644
--- a/mdk-stage1/disk.c
+++ b/mdk-stage1/disk.c
@@ -191,7 +191,7 @@ enum return_type disk_prepare(void)
 	if (count == 0) {
 		if (!already_probed_ide_generic) {
 			already_probed_ide_generic = 1;
-			my_modprobe("ide_generic", ANY_DRIVER_TYPE, NULL, 0);
+			my_modprobe("ide_generic", ANY_DRIVER_TYPE, NULL);
 			return disk_prepare();
 		}
 		stg1_error_message("No DISK drive found.");
diff --git a/mdk-stage1/lomount.c b/mdk-stage1/lomount.c
index 08f80e464..caca48ea1 100644
--- a/mdk-stage1/lomount.c
+++ b/mdk-stage1/lomount.c
@@ -165,9 +165,9 @@ lomount(char *loopfile, char *where, char **dev, int compressed)
 	flag = MS_MGC_VAL;
 	flag |= MS_RDONLY;
 
-	my_modprobe("loop", ANY_DRIVER_TYPE, "max_loop=256", 1);
+	my_modprobe("loop", ANY_DRIVER_TYPE, "max_loop=256");
 	if (compressed) {
-	    my_modprobe("squashfs", ANY_DRIVER_TYPE, NULL, 1);
+	    my_modprobe("squashfs", ANY_DRIVER_TYPE, NULL);
 	}
 
         if (!(loopdev = find_free_loop())) {
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index f1fd12130..d3d92ea81 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -300,7 +300,7 @@ int module_already_present(const char * name)
 
 
 #ifndef ENABLE_NETWORK_STANDALONE
-static enum insmod_return insmod_with_deps(const char * mod_name, char * options, int allow_modules_floppy)
+static enum insmod_return insmod_with_deps(const char * mod_name, char * options)
 {
 	struct module_deps_elem * dep;
 	const char * filename;
@@ -314,7 +314,7 @@ static enum insmod_return insmod_with_deps(const char * mod_name, char * options
 		while (*one_dep) {
 			/* here, we can fail but we don't care, if the error is
 			 * important, the desired module will fail also */
-			insmod_with_deps(*one_dep, NULL, allow_modules_floppy);
+			insmod_with_deps(*one_dep, NULL);
 			one_dep++;
 		}
 	}
@@ -338,9 +338,9 @@ static enum insmod_return insmod_with_deps(const char * mod_name, char * options
 
 
 #ifndef DISABLE_NETWORK
-enum insmod_return my_modprobe(const char * mod_name, enum driver_type type, char * options, int allow_modules_floppy)
+enum insmod_return my_modprobe(const char * mod_name, enum driver_type type, char * options)
 #else
-enum insmod_return my_modprobe(const char * mod_name, enum driver_type type __attribute__ ((unused)), char * options, int allow_modules_floppy)
+enum insmod_return my_modprobe(const char * mod_name, enum driver_type type __attribute__ ((unused)), char * options)
 #endif
 {
 	int i;
@@ -366,7 +366,7 @@ enum insmod_return my_modprobe(const char * mod_name, enum driver_type type __at
 		i = system(cmd);
 	}
 #else
-	i = insmod_with_deps(mod_name, options, allow_modules_floppy);
+	i = insmod_with_deps(mod_name, options);
 #endif
 	if (i == 0) {
 		log_message("\tsucceeded %s", mod_name);
@@ -413,7 +413,7 @@ static enum return_type insmod_with_options(char * mod, enum driver_type type)
 	strcat(options, " ");
 	strcat(options, answers[0]); // because my_modprobe will eventually modify the string
 	
-	if (my_modprobe(mod, type, answers[0], 1) != INSMOD_OK) {
+	if (my_modprobe(mod, type, answers[0]) != INSMOD_OK) {
 		stg1_error_message("Insmod failed.");
 		return RETURN_ERROR;
 	}
diff --git a/mdk-stage1/modules.h b/mdk-stage1/modules.h
index f04879fb0..fd8a22746 100644
--- a/mdk-stage1/modules.h
+++ b/mdk-stage1/modules.h
@@ -23,7 +23,7 @@ enum insmod_return { INSMOD_OK, INSMOD_FAILED, INSMOD_FAILED_FILE_NOT_FOUND };
 void init_modules_insmoding(void);
 void init_firmware_loader(void);
 int insmod_local_file(char * path, char * options);
-enum insmod_return my_modprobe(const char * mod_name, enum driver_type type, char * options, int allow_modules_floppy);
+enum insmod_return my_modprobe(const char * mod_name, enum driver_type type, char * options);
 enum return_type ask_insmod(enum driver_type);
 int module_already_present(const char * name);
 
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 008fb5f6b..d1b290a70 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -212,8 +212,8 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
 	}
 
 	if (!strcmp(fs, "supermount")) {
-		my_modprobe("supermount", ANY_DRIVER_TYPE, NULL, 1);
-		my_modprobe("isofs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("supermount", ANY_DRIVER_TYPE, NULL);
+		my_modprobe("isofs", ANY_DRIVER_TYPE, NULL);
 		opts = alloca(500);
                 sprintf(opts, "dev=%s,fs=iso9660,tray_lock=always", dev);
                 dev = "none";
@@ -221,41 +221,41 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
 
 #ifndef DISABLE_MEDIAS
 	if (!strcmp(fs, "vfat")) {
-		my_modprobe("nls_cp437", ANY_DRIVER_TYPE, NULL, 1);
-		my_modprobe("nls_iso8859_1", ANY_DRIVER_TYPE, NULL, 1);
-		my_modprobe("vfat", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("nls_cp437", ANY_DRIVER_TYPE, NULL);
+		my_modprobe("nls_iso8859_1", ANY_DRIVER_TYPE, NULL);
+		my_modprobe("vfat", ANY_DRIVER_TYPE, NULL);
 		opts = "check=relaxed";
 	}
 
 	if (!strcmp(fs, "ntfs")) {
-		my_modprobe("ntfs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("ntfs", ANY_DRIVER_TYPE, NULL);
 	}
 
 	if (!strcmp(fs, "reiserfs"))
-		my_modprobe("reiserfs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("reiserfs", ANY_DRIVER_TYPE, NULL);
 
 	if (!strcmp(fs, "reiser4"))
-		my_modprobe("reiser4", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("reiser4", ANY_DRIVER_TYPE, NULL);
 
 	if (!strcmp(fs, "jfs"))
-		my_modprobe("jfs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("jfs", ANY_DRIVER_TYPE, NULL);
 
 	if (!strcmp(fs, "xfs"))
-		my_modprobe("xfs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("xfs", ANY_DRIVER_TYPE, NULL);
 
 	if (!strcmp(fs, "ext4"))
-		my_modprobe("ext4", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("ext4", ANY_DRIVER_TYPE, NULL);
 
 	if (!strcmp(fs, "btrfs"))
-		my_modprobe("btrfs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("btrfs", ANY_DRIVER_TYPE, NULL);
 
 #endif
 	if (!strcmp(fs, "iso9660"))
-		my_modprobe("isofs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("isofs", ANY_DRIVER_TYPE, NULL);
 
 #ifndef DISABLE_NETWORK
 	if (!strcmp(fs, "nfs")) {
-		my_modprobe("nfs", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("nfs", ANY_DRIVER_TYPE, NULL);
 		log_message("preparing nfsmount for %s", dev);
 		rc = nfsmount_prepare(dev, &opts);
 		if (rc != 0)
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index c3ac0f36a..4d7f1ac6c 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -575,7 +575,7 @@ static enum return_type bringup_networking(struct interface_info * intf)
 	/* badly */
 	fd = open("/proc/net/packet", O_RDONLY);
 	if (fd < 0)
-		my_modprobe("af_packet", ANY_DRIVER_TYPE, NULL, 1);
+		my_modprobe("af_packet", ANY_DRIVER_TYPE, NULL);
 	else
 		close(fd);
 
diff --git a/mdk-stage1/probe-modules.c b/mdk-stage1/probe-modules.c
index 550690558..86b383b5e 100644
--- a/mdk-stage1/probe-modules.c
+++ b/mdk-stage1/probe-modules.c
@@ -58,7 +58,7 @@ int main(int argc, char **argv, char **env)
 	init_modules_insmoding();
 
 	if (module) {
-		my_modprobe(module, ANY_DRIVER_TYPE, options, 0);
+		my_modprobe(module, ANY_DRIVER_TYPE, options);
 	} else {
 		find_media(bus);
 	}
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index 224bf42ea..1cdadd591 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -272,10 +272,10 @@ void discovered_device(enum driver_type type, const char * description, const ch
 	if (type == MEDIA_ADAPTERS) {
 		const char * alternate = NULL;
 		wait_message("Loading driver for media adapter:\n \n%s", description);
-		failed = my_modprobe(driver, MEDIA_ADAPTERS, NULL, 1);
+		failed = my_modprobe(driver, MEDIA_ADAPTERS, NULL);
 		alternate = get_alternate_module(driver);
 		if (!IS_NOAUTO && alternate) {
-			failed = failed || my_modprobe(alternate, MEDIA_ADAPTERS, NULL, 1);
+			failed = failed || my_modprobe(alternate, MEDIA_ADAPTERS, NULL);
 		}
 		remove_wait_message();
 		warning_insmod_failed(failed);
@@ -285,7 +285,7 @@ void discovered_device(enum driver_type type, const char * description, const ch
 	if (type == NETWORK_DEVICES) {
 		wait_message("Loading driver for network device:\n \n%s", description);
 		prepare_intf_descr(description);
-		failed = my_modprobe(driver, NETWORK_DEVICES, NULL, 1);
+		failed = my_modprobe(driver, NETWORK_DEVICES, NULL);
 		warning_insmod_failed(failed);
 		remove_wait_message();
 		if (intf_descr_for_discover) /* for modules providing more than one net intf */
@@ -295,7 +295,7 @@ void discovered_device(enum driver_type type, const char * description, const ch
 #ifdef ENABLE_USB
 	if (type == USB_CONTROLLERS)
                 /* we can't allow additional modules floppy since we need usbhid for keystrokes of usb keyboards */
-		failed = my_modprobe(driver, USB_CONTROLLERS, NULL, 0);
+		failed = my_modprobe(driver, USB_CONTROLLERS, NULL);
 #endif
 }
 
@@ -337,7 +337,7 @@ void probe_virtio_modules(void)
 		if (e->vendor == VIRTIO_PCI_VENDOR) {
 			if (!loaded_pci) {
 				log_message("loading virtio-pci");
-				my_modprobe("virtio_pci", ANY_DRIVER_TYPE, NULL, 0);
+				my_modprobe("virtio_pci", ANY_DRIVER_TYPE, NULL);
 				loaded_pci = 1;
 			}
 
@@ -360,7 +360,7 @@ void probe_virtio_modules(void)
 			}
 			if (name) {
 				log_message("virtio: loading %s", name);
-				my_modprobe(name, ANY_DRIVER_TYPE, options, 0);
+				my_modprobe(name, ANY_DRIVER_TYPE, options);
 			}
 		}
 	}
@@ -431,7 +431,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
 			already_mounted_usbdev = 1;
 			wait_message("Detecting USB devices.");
 			sleep(4); /* sucking background work */
-			my_modprobe("usbhid", ANY_DRIVER_TYPE, NULL, 0);
+			my_modprobe("usbhid", ANY_DRIVER_TYPE, NULL);
 			remove_wait_message();
 		}
 
@@ -546,9 +546,9 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u
             already_probed_usb_controllers && !already_loaded_usb_scsi) {
                 already_loaded_usb_scsi = 1;
                 /* we can't allow additional modules floppy since we need usbkbd for keystrokes of usb keyboards */
-                my_modprobe("usb_storage", MEDIA_ADAPTERS, NULL, 0); 
+                my_modprobe("usb_storage", MEDIA_ADAPTERS, NULL); 
                 if (module_already_present("ieee1394"))
-                        my_modprobe("sbp2", MEDIA_ADAPTERS, NULL, 0);
+                        my_modprobe("sbp2", MEDIA_ADAPTERS, NULL);
                 wait_message("Detecting USB mass-storage devices.");
 #ifndef DEBUG
                 sleep(10); /* sucking background work */
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 8a0de4921..4bed00057 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -225,12 +225,12 @@ static void handle_pcmcia(void)
 		log_message("no pcmcia adapter found");
 		return;
 	}
-	my_modprobe("pcmcia_core", ANY_DRIVER_TYPE, NULL, 0);
-	my_modprobe(pcmcia_adapter, ANY_DRIVER_TYPE, NULL, 0);
+	my_modprobe("pcmcia_core", ANY_DRIVER_TYPE, NULL);
+	my_modprobe(pcmcia_adapter, ANY_DRIVER_TYPE, NULL);
 	/* ds is an alias for pcmcia in recent 2.6 kernels
            but we don't have modules.alias in install, so try to load both */
-	my_modprobe("ds", ANY_DRIVER_TYPE, NULL, 0);
-	my_modprobe("pcmcia", ANY_DRIVER_TYPE, NULL, 0);
+	my_modprobe("ds", ANY_DRIVER_TYPE, NULL);
+	my_modprobe("pcmcia", ANY_DRIVER_TYPE, NULL);
 	
         /* setup a dynamic resource database for non statically mapped PCMCIA sockets */
 	pcmcia_socket_startup(-1);
@@ -248,9 +248,9 @@ static void handle_hid(void)
 	entry_list = hid_probe();
 	for (i = 0; i < entry_list.nb; i++) {
 		if (entry_list.entries[i].module != NULL)
-			my_modprobe(entry_list.entries[i].module, ANY_DRIVER_TYPE, NULL, 0);
+			my_modprobe(entry_list.entries[i].module, ANY_DRIVER_TYPE, NULL);
 	}
-	my_modprobe("hid_generic", ANY_DRIVER_TYPE, NULL, 0);
+	my_modprobe("hid_generic", ANY_DRIVER_TYPE, NULL);
 }
 
 
diff --git a/mdk-stage1/thirdparty.c b/mdk-stage1/thirdparty.c
index e2e416e0a..38200357c 100644
--- a/mdk-stage1/thirdparty.c
+++ b/mdk-stage1/thirdparty.c
@@ -333,7 +333,7 @@ static enum return_type thirdparty_autoload_modules(const char *modules_location
 			entry++;
 		}
 		if (!entry || !*entry) {
-			enum insmod_return ret = my_modprobe(module, ANY_DRIVER_TYPE, options, 0);
+			enum insmod_return ret = my_modprobe(module, ANY_DRIVER_TYPE, options);
 			if (ret != INSMOD_OK) {
 				log_message("\t%s (marfile): failed", module);
 				stg1_error_message("Insmod %s (marfile) failed.", module);
diff --git a/mdk-stage1/tools.c b/mdk-stage1/tools.c
index 768b1f2f7..aca40c971 100644
--- a/mdk-stage1/tools.c
+++ b/mdk-stage1/tools.c
@@ -294,8 +294,8 @@ int get_disks(char *** names, char *** models)
 	char ** ptr;
 	int count = 0;
 
-	my_modprobe("ide_disk", ANY_DRIVER_TYPE, NULL, 0);
-	my_modprobe("sd_mod", ANY_DRIVER_TYPE, NULL, 0);
+	my_modprobe("ide_disk", ANY_DRIVER_TYPE, NULL);
+	my_modprobe("sd_mod", ANY_DRIVER_TYPE, NULL);
 
 	get_medias(DISK, names, models, BUS_ANY);
 
@@ -315,8 +315,8 @@ int get_cdroms(char *** names, char *** models)
 	char ** ptr;
 	int count = 0;
 
-	my_modprobe("ide_cd_mod", ANY_DRIVER_TYPE, NULL, 0);
-	my_modprobe("sr_mod", ANY_DRIVER_TYPE, NULL, 0);
+	my_modprobe("ide_cd_mod", ANY_DRIVER_TYPE, NULL);
+	my_modprobe("sr_mod", ANY_DRIVER_TYPE, NULL);
 
 	get_medias(CDROM, names, models, BUS_ANY);
 
@@ -334,7 +334,7 @@ char * floppy_device(void)
 {
         char ** names, ** models;
         int fd;
-	my_modprobe("floppy", ANY_DRIVER_TYPE, NULL, 0);
+	my_modprobe("floppy", ANY_DRIVER_TYPE, NULL);
         fd = open("/dev/fd0", O_RDONLY|O_NONBLOCK);
         if (fd != -1) {
                 char drivtyp[17];
@@ -354,7 +354,7 @@ char * floppy_device(void)
                 close(fd);
         }
         log_message("seems that you don't have a regular floppy drive");
-        my_modprobe("sd_mod", ANY_DRIVER_TYPE, NULL, 0);
+        my_modprobe("sd_mod", ANY_DRIVER_TYPE, NULL);
 	get_medias(FLOPPY, &names, &models, BUS_ANY);
 	if (names && *names)
                 return asprintf_("/dev/%s", *names);