[PATCH 4/3] mark unused/obsolede definitions with CONFIG_PCMCIA_OBSOLETE

[Dominik Brodowski]

- mark the parts of include/pcmcia/bulkmem.h and drivers/pcmcia/cs_internal.h
  which are only used by OBSOLETE code as OBSOLETE, too.
- mark socket->erase_busy and client->erase_busy as OBSOLETE, too, as they seem
  to be unused, too

 drivers/pcmcia/cs.c          |    2 ++
 drivers/pcmcia/cs_internal.h |   22 ++++++++++++++--------
 drivers/pcmcia/ds.c          |    2 ++
 include/pcmcia/bulkmem.h     |    9 +++++++++
 include/pcmcia/cs_types.h    |    2 ++
 include/pcmcia/ss.h          |    7 +++++--
 6 files changed, 34 insertions(+), 10 deletions(-)

diff -ruN linux-original/drivers/pcmcia/cs.c linux/drivers/pcmcia/cs.c
--- linux-original/drivers/pcmcia/cs.c	2004-03-25 18:10:08.000000000 +0100
+++ linux/drivers/pcmcia/cs.c	2004-03-25 20:24:57.024628568 +0100
@@ -249,7 +249,9 @@
 	/* base address = 0, map = 0 */
 	socket->cis_mem.flags = 0;
 	socket->cis_mem.speed = cis_speed;
+#ifdef CONFIG_PCMCIA_OBSOLETE
 	socket->erase_busy.next = socket->erase_busy.prev = &socket->erase_busy;
+#endif
 	INIT_LIST_HEAD(&socket->cis_cache);
 	spin_lock_init(&socket->lock);
 
diff -ruN linux-original/drivers/pcmcia/cs_internal.h linux/drivers/pcmcia/cs_internal.h
--- linux-original/drivers/pcmcia/cs_internal.h	2004-03-25 18:10:08.000000000 +0100
+++ linux/drivers/pcmcia/cs_internal.h	2004-03-25 20:24:57.411569744 +0100
@@ -21,14 +21,6 @@
 
 #include <linux/config.h>
 
-#define ERASEQ_MAGIC	0xFA67
-typedef struct eraseq_t {
-    u_short		eraseq_magic;
-    client_handle_t	handle;
-    int			count;
-    eraseq_entry_t	*entry;
-} eraseq_t;
-
 #define CLIENT_MAGIC 	0x51E6
 typedef struct client_t {
     u_short		client_magic;
@@ -44,7 +36,9 @@
     struct client_t 	*next;
     u_int		mtd_count;
     wait_queue_head_t	mtd_req;
+#ifdef CONFIG_PCMCIA_OBSOLETE
     erase_busy_t	erase_busy;
+#endif
 } client_t;
 
 /* Flags in client state */
@@ -214,4 +208,16 @@
 #define cs_err(skt, fmt, arg...) \
 	printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.class_id , ## arg)
 
+#ifdef CONFIG_PCMCIA_OBSOLETE
+
+#define ERASEQ_MAGIC	0xFA67
+typedef struct eraseq_t {
+    u_short		eraseq_magic;
+    client_handle_t	handle;
+    int			count;
+    eraseq_entry_t	*entry;
+} eraseq_t;
+
+#endif
+
 #endif /* _LINUX_CS_INTERNAL_H */
diff -ruN linux-original/drivers/pcmcia/ds.c linux/drivers/pcmcia/ds.c
--- linux-original/drivers/pcmcia/ds.c	2004-03-25 18:10:08.000000000 +0100
+++ linux/drivers/pcmcia/ds.c	2004-03-25 20:24:57.412569592 +0100
@@ -166,8 +166,10 @@
 	client->Socket = s;
 	client->Function = req->Function;
 	client->state = CLIENT_UNBOUND;
+#ifdef CONFIG_PCMCIA_OBSOLETE
 	client->erase_busy.next = &client->erase_busy;
 	client->erase_busy.prev = &client->erase_busy;
+#endif
 	init_waitqueue_head(&client->mtd_req);
 	client->next = s->clients;
 	s->clients = client;
diff -ruN linux-original/include/pcmcia/bulkmem.h linux/include/pcmcia/bulkmem.h
--- linux-original/include/pcmcia/bulkmem.h	2004-03-25 18:10:15.000000000 +0100
+++ linux/include/pcmcia/bulkmem.h	2004-03-25 20:24:57.425567616 +0100
@@ -48,11 +48,15 @@
 #define REGION_TYPE		0x0001
 #define REGION_TYPE_CM		0x0000
 #define REGION_TYPE_AM		0x0001
+
+#ifdef CONFIG_PCMCIA_OBSOLETE
+
 #define REGION_PREFETCH		0x0008
 #define REGION_CACHEABLE	0x0010
 #define REGION_BAR_MASK		0xe000
 #define REGION_BAR_SHIFT	13
 
+
 /* For OpenMemory */
 typedef struct open_mem_t {
     u_int		Attributes;
@@ -192,8 +196,12 @@
 extern int MTDHelperEntry(int func, ...);
 #endif
 
+#endif /* CONFIG_PCMCIA_OBSOLETE */
+
 int pcmcia_get_first_region(client_handle_t handle, region_info_t *rgn);
 int pcmcia_get_next_region(client_handle_t handle, region_info_t *rgn);
+
+#ifdef CONFIG_PCMCIA_OBSOLETE
 int pcmcia_register_mtd(client_handle_t handle, mtd_reg_t *reg);
 int pcmcia_register_erase_queue(client_handle_t *handle, eraseq_hdr_t *header, eraseq_handle_t *e);
 int pcmcia_deregister_erase_queue(eraseq_handle_t eraseq);
@@ -203,5 +211,6 @@
 int pcmcia_read_memory(memory_handle_t handle, mem_op_t *req, caddr_t buf);
 int pcmcia_write_memory(memory_handle_t handle, mem_op_t *req, caddr_t buf);
 int pcmcia_copy_memory(memory_handle_t handle, copy_op_t *req);
+#endif
 
 #endif /* _LINUX_BULKMEM_H */
diff -ruN linux-original/include/pcmcia/cs_types.h linux/include/pcmcia/cs_types.h
--- linux-original/include/pcmcia/cs_types.h	2004-03-25 18:10:15.000000000 +0100
+++ linux/include/pcmcia/cs_types.h	2004-03-25 20:24:57.425567616 +0100
@@ -56,8 +56,10 @@
 struct region_t;
 typedef struct region_t *memory_handle_t;
 
+#ifdef CONFIG_PCMCIA_OBSOLETE
 struct eraseq_t;
 typedef struct eraseq_t *eraseq_handle_t;
+#endif
 
 #ifndef DEV_NAME_LEN
 #define DEV_NAME_LEN 32
diff -ruN linux-original/include/pcmcia/ss.h linux/include/pcmcia/ss.h
--- linux-original/include/pcmcia/ss.h	2004-03-25 18:10:15.000000000 +0100
+++ linux/include/pcmcia/ss.h	2004-03-25 20:24:57.426567464 +0100
@@ -134,12 +134,14 @@
  */
 struct pcmcia_socket;
 
+#ifdef CONFIG_PCMCIA_OBSOLETE
 typedef struct erase_busy_t {
 	eraseq_entry_t		*erase;
 	client_handle_t		client;
 	struct timer_list	timeout;
 	struct erase_busy_t	*prev, *next;
 } erase_busy_t;
+#endif
 
 typedef struct io_window_t {
 	u_int			Attributes;
@@ -185,7 +187,6 @@
 	io_window_t			io[MAX_IO_WIN];
 	window_t			win[MAX_WIN];
 	struct region_t			*c_region, *a_region;
-	erase_busy_t			erase_busy;
 	struct list_head		cis_cache;
 	u_int				fake_cis_len;
 	char				*fake_cis;
@@ -195,7 +196,9 @@
 
  	/* deprecated */
 	unsigned int			sock;		/* socket number */
-
+#ifdef CONFIG_PCMCIA_OBSOLETE
+	erase_busy_t			erase_busy;
+#endif
 
 	/* socket capabilities */
 	u_int				features;