diff options
| author |   Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-17 18:13:31 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 17:48:25 +0100 |
| commit | f971dbd5da4e2fbf756d07b938a9c65a9c75178b (patch) | |
| tree | d21b138ac2ea3ada0e27910425cfd988f72dbede /drivers/pcmcia/cs_internal.h | |
| parent | pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking (diff) | |
| download | linux-dev-f971dbd5da4e2fbf756d07b938a9c65a9c75178b.tar.xz linux-dev-f971dbd5da4e2fbf756d07b938a9c65a9c75178b.zip | |
pcmcia: use pccardd to handle eject, insert, suspend and resume requests
This avoids any sysfs-related deadlock (or lockdep warning), such
as reported at http://lkml.org/lkml/2010/1/17/88 .
Reported-by: Ming Lei <tom.leiming@gmail.com>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
| -rw-r--r-- | drivers/pcmcia/cs_internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index bd386d77845e..127c97acf849 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h @@ -124,11 +124,11 @@ extern struct class pcmcia_socket_class; int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr); -int pcmcia_suspend_card(struct pcmcia_socket *skt); -int pcmcia_resume_card(struct pcmcia_socket *skt); - -int pcmcia_eject_card(struct pcmcia_socket *skt); -int pcmcia_insert_card(struct pcmcia_socket *skt); +void pcmcia_parse_uevents(struct pcmcia_socket *socket, unsigned int events); +#define PCMCIA_UEVENT_EJECT 0x0001 +#define PCMCIA_UEVENT_INSERT 0x0002 +#define PCMCIA_UEVENT_SUSPEND 0x0004 +#define PCMCIA_UEVENT_RESUME 0x0008 struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt); void pcmcia_put_socket(struct pcmcia_socket *skt); |