Skip to content

Commit

Permalink
pcmcia: remove useless msleep in ds.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dominik Brodowski committed Feb 17, 2010
1 parent d700518 commit d801c14
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 3 additions & 0 deletions drivers/pcmcia/cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions drivers/pcmcia/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit d801c14

Please sign in to comment.