diff options
| author |   Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 11:02:22 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 18:05:54 +0100 |
| commit | d801c1409ef7d45339cbe8ac9de28ade6ed4699a (patch) | |
| tree | b43b05716947bf8fa87689ae4f3ae6908552eedd /drivers/pcmcia | |
| parent | pcmcia: use read_cis_mem return value (diff) | |
| download | linux-dev-d801c1409ef7d45339cbe8ac9de28ade6ed4699a.tar.xz linux-dev-d801c1409ef7d45339cbe8ac9de28ade6ed4699a.zip | |
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>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/cs.c | 3 | ||||
| -rw-r--r-- | drivers/pcmcia/ds.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 9a49c394f04f..e679e708db63 100644 --- 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 93925f5908b8..0f98be4450b7 100644 --- 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"); |