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>

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 9a49c394f04f44b1f631c85668c27e5fda36c6f8..e679e708db630e3c8a93a7f6d87ded908a2c397e 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -689,6 +689,9 @@ static int pccardd(void *__skt)
 
        complete(&skt->thread_done);
 
+       /* wait for userspace to catch up */
+       msleep(250);
+
        set_freezable();
        for (;;) {
                unsigned long flags;

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 93925f5908b8fd876e7e7cbefe878133bcf8d7ed..0f98be4450b7a0e01a31e90542011bf46f47a4b2 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1356,12 +1356,6 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
                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);
        if (ret) {
                dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");