summary refs log tree commit diff
path: root/include/pcmcia/ds.h
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-01-20 15:10:23 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 17:26:31 +0200
commitf6fbe01ac976f3ec618cd5fb71ad9ce2cfa7ab2b (patch)
tree60758f4c397c9123b40e2ab5da14b5ffc3a5c3d9 /include/pcmcia/ds.h
parentb4c884000a7d3664dd8ad7227241456bd7824d86 (diff)
downloadlinux-f6fbe01ac976f3ec618cd5fb71ad9ce2cfa7ab2b.tar.gz
[PATCH] pcmcia: remove unused p_dev->state flags
Remove the unused DEV_RELEASE_PENDING flag, and move the DEV_SUSPEND flag
into the p_dev structure, and make use of it at the core level.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

Diffstat (limited to 'include/pcmcia/ds.h')
-rw-r--r--include/pcmcia/ds.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 557d8aea1a86..93a7ebc34156 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -108,8 +108,6 @@ typedef struct dev_node_t {
 #define DEV_CONFIG		0x02
 #define DEV_SUSPEND_NORELEASE	0x04
 #define DEV_CONFIG_PENDING	0x10
-#define DEV_RELEASE_PENDING	0x20
-#define DEV_SUSPEND		0x40
 #define DEV_BUSY		0x80
 
 #define DEV_OK(l) \
@@ -163,13 +161,15 @@ struct pcmcia_device {
 
 	u_int			p_state;
 
+	u8			suspended:1;
+	u8			reserved:3;
+
 	/* information about this device */
 	u8			has_manf_id:1;
 	u8			has_card_id:1;
 	u8			has_func_id:1;
 
 	u8			allow_func_id_match:1;
-	u8			reserved:4;
 
 	u8			func_id;
 	u16			manf_id;