[Acx100-devel] [PATCH 20/24] cleanup *_cmd_type_status

[Jim C. <jim...@gm...>]

- drop #if0 around merge.c:acx_read_cmd_type_status()
- drop obsolete *_cmd_type_status() fn-protos in pci.h, mem.h
- drop commented fn-protos in mem.h

Signed-off-by: Jim Cromie <jim...@gm...>
---
 mem.h   | 21 +++------------------
 merge.c |  2 --
 pci.h   |  4 ----
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/mem.h b/mem.h
index 9988dfd..fe58450 100644
--- a/mem.h
+++ b/mem.h
@@ -1,8 +1,8 @@
 
 /* this file provides prototypes for functions defined in mem.c that
- * are used by common.c etc, and is thus the internal API.  It also
- * forward declares some of the functions used in mem.c, reducing the
- * set of forward declarations in mem.c
+ * are used by common.c etc; it is part of the internal API.  It also
+ * forward declares some of the functions used in mem.c, which reduces
+ * the set of forward declarations in mem.c
  */
 #ifndef _MEM_H_
 #define _MEM_H_
@@ -42,9 +42,6 @@ void acxmem_init_acx_txbuf2(acx_device_t *adev);
 int __init acxmem_init_module(void);
 void __exit acxmem_cleanup_module(void);
 
-void acxmem_write_cmd_type_status(acx_device_t *adev, u16 type,
-				u16 status);
-
 
 #else /* !CONFIG_ACX_MAC80211_MEM */
 
@@ -67,14 +64,6 @@ static inline void acxmem_chaincopy_from_slavemem(acx_device_t *adev,
 		u8 *destination, u32 source, int count)
 { }
 
-/* inline int acxmem_upload_radio(acx_device_t *adev)
- * { return 0; }
- */
-
-//static inline int acxmem_write_fw(acx_device_t *adev,
-//		const firmware_image_t *fw_image, u32 offset)
-//{ return 0; }
-
 static inline void acxmem_reset_mac(acx_device_t *adev)
 { }
 
@@ -101,10 +90,6 @@ static inline int __init acxmem_init_module(void)
 static inline void __exit acxmem_cleanup_module(void)
 { }
 
-static inline void acxmem_write_cmd_type_status(acx_device_t *adev,
-		u16 type, u16 status)
-{ }
-
 static inline void acxmem_init_mboxes(acx_device_t *adev) { }
 
 #endif /* defined(CONFIG_ACX_MAC80211_MEM) */
diff --git a/merge.c b/merge.c
index 2e19c44..c5ea9b5 100644
--- a/merge.c
+++ b/merge.c
@@ -1573,7 +1573,6 @@ static inline void acx_show_card_eeprom_id(acx_device_t *adev) {}
  * ==================================================
  */
 
-#if 1	/* acx_read_cmd_type_status() */
 u32 acx_read_cmd_type_status(acx_device_t *adev)
 {
 	u32 cmd_type, cmd_status;
@@ -1593,7 +1592,6 @@ u32 acx_read_cmd_type_status(acx_device_t *adev)
 	FN_EXIT1(cmd_status);
 	return cmd_status;
 }
-#endif	/* acx_read_cmd_type_status() */
 
 /* static inline  */
 void acx_write_cmd_type_status(acx_device_t *adev, u16 type, u16 status)
diff --git a/pci.h b/pci.h
index ee6f573..3419773 100644
--- a/pci.h
+++ b/pci.h
@@ -40,10 +40,6 @@ tx_t *acxpci_alloc_tx(acx_device_t *adev);
  * Driver, Module
  */
 
-u32 acxpci_read_cmd_type_status(acx_device_t *adev);
-void acxpci_write_cmd_type_status(acx_device_t *adev, u16 type,
-		u16 status);
-
 #if defined(CONFIG_ACX_MAC80211_PCI)
 
 int __init acxpci_init_module(void);
-- 
1.7.10.1.487.ga3935e6