Browse Source

pcmcia: remove useless msleep in ds.c

As this is the socket thread (pccardd) starting up, we do not have
anything to wait for in ds.c. Instead, wait the same amount of time
in pccardd to allow userspace to catch up and - possibly - execute
pcmcia-socket-startup.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Dominik Brodowski 15 years ago
parent
commit
d801c1409e
2 changed files with 3 additions and 6 deletions
  1. 3 0
      drivers/pcmcia/cs.c
  2. 0 6
      drivers/pcmcia/ds.c

+ 3 - 0
drivers/pcmcia/cs.c

@@ -689,6 +689,9 @@ static int pccardd(void *__skt)
 
 
 	complete(&skt->thread_done);
 	complete(&skt->thread_done);
 
 
+	/* wait for userspace to catch up */
+	msleep(250);
+
 	set_freezable();
 	set_freezable();
 	for (;;) {
 	for (;;) {
 		unsigned long flags;
 		unsigned long flags;

+ 0 - 6
drivers/pcmcia/ds.c

@@ -1356,12 +1356,6 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
 		return -ENODEV;
 		return -ENODEV;
 	}
 	}
 
 
-	/*
-	 * Ugly. But we want to wait for the socket threads to have started up.
-	 * We really should let the drivers themselves drive some of this..
-	 */
-	msleep(250);
-
 	ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
 	ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);
 	if (ret) {
 	if (ret) {
 		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");
 		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");