diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-06-28 01:28:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 03:03:19 +0200 |
| commit | b5e43913cfe95a18ad8929585a0bb58e46cf3390 (patch) | |
| tree | 2dbdcf979e3a300141c1ffdaf96e03127675cb1e /drivers/pcmcia/ds_internal.h | |
| parent | [PATCH] pcmcia: clean up cs ds callback (diff) | |
| download | linux-b5e43913cfe95a18ad8929585a0bb58e46cf3390.tar.xz linux-b5e43913cfe95a18ad8929585a0bb58e46cf3390.zip | |
[PATCH] pcmcia: make PCMCIA status a bitfield
make pcmcia_bus_socket->state a bitfield, and rename it pcmcia_state to
prepare for struct pcmcia_bus_socket integration into struct pcmcia_socket.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pcmcia/ds_internal.h')
| -rw-r--r-- | drivers/pcmcia/ds_internal.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/pcmcia/ds_internal.h b/drivers/pcmcia/ds_internal.h index b05bc39d9cd6..2c3bb189dec6 100644 --- a/drivers/pcmcia/ds_internal.h +++ b/drivers/pcmcia/ds_internal.h @@ -5,7 +5,6 @@ struct user_info_t; /* Socket state information */ struct pcmcia_bus_socket { struct kref refcount; - int state; struct pcmcia_socket *parent; /* the PCMCIA devices connected to this socket (normally one, more @@ -15,7 +14,14 @@ struct pcmcia_bus_socket { * only internally and subject * to incorrectness and change */ - u8 device_add_pending; + struct { + u8 present:1, + busy:1, + dead:1, + device_add_pending:1, + reserved:4; + } pcmcia_state; + struct work_struct device_add; @@ -29,10 +35,6 @@ extern spinlock_t pcmcia_dev_list_lock; extern struct bus_type pcmcia_bus_type; -#define DS_SOCKET_PRESENT 0x01 -#define DS_SOCKET_BUSY 0x02 -#define DS_SOCKET_DEAD 0x80 - extern struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev); extern void pcmcia_put_dev(struct pcmcia_device *p_dev); |