[Acx100-devel] [PATCH 06/11] pci: move 2 static inline funcs to pci.h

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

Move acxpci_get_txdesc() and acxpci_advance_txdesc() from pci.c to
pci.h, to allow their use from merge.c May eventually move one or both
back to pci.c or into merge.c if theyre not needed elsewhere.

Signed-off-by: Jim Cromie <jim...@gm...>
---
 pci.c |   14 --------------
 pci.h |   18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pci.c b/pci.c
index 096e1fb..26dc9f6 100644
--- a/pci.c
+++ b/pci.c
@@ -1863,20 +1863,6 @@ void acxpci_clean_txdesc_emergency(acx_device_t * adev)
 	FN_EXIT0;
 }
 
-// static 
-inline txdesc_t *acxpci_get_txdesc(acx_device_t * adev, int index)
-{
-	return (txdesc_t *) (((u8 *) adev->txdesc_start) +
-			     index * adev->txdesc_size);
-}
-
-// static inline 
-txdesc_t *acxpci_advance_txdesc(acx_device_t *adev, txdesc_t *txdesc,
-				int inc)
-{
-	return (txdesc_t *) (((u8 *) txdesc) + inc * adev->txdesc_size);
-}
-
 #if 1 // merge soon
 // static 
 txhostdesc_t *acxpci_get_txhostdesc(acx_device_t *adev, txdesc_t *txdesc)
diff --git a/pci.h b/pci.h
index d339c0a..a091fef 100644
--- a/pci.h
+++ b/pci.h
@@ -68,8 +68,8 @@ void *acxpci_get_txbuf(acx_device_t * adev, tx_t * tx_opaque);
 void acxpci_tx_data(acx_device_t *adev, tx_t *tx_opaque, int len, struct ieee80211_tx_info *info, struct sk_buff *skb);
 unsigned int acxpci_tx_clean_txdesc(acx_device_t * adev);
 void acxpci_clean_txdesc_emergency(acx_device_t * adev);
-STATick inline txdesc_t *acxpci_get_txdesc(acx_device_t * adev, int index);
-STATick inline txdesc_t *acxpci_advance_txdesc(acx_device_t * adev, txdesc_t * txdesc, int inc);
+//= STATick inline txdesc_t *acxpci_get_txdesc(acx_device_t * adev, int index);
+//= STATick inline txdesc_t *acxpci_advance_txdesc(acx_device_t * adev, txdesc_t * txdesc, int inc);
 STATick txhostdesc_t *acxpci_get_txhostdesc(acx_device_t * adev, txdesc_t * txdesc);
 
 // Irq Handling, Timer
@@ -104,3 +104,17 @@ STATick int acxpci_e_resume(struct pci_dev *pdev);
 int __init acxpci_init_module(void);
 void __exit acxpci_cleanup_module(void);
 
+// make available to merge.c
+static inline txdesc_t *acxpci_get_txdesc(acx_device_t * adev, int index)
+{
+	return (txdesc_t *) (((u8 *) adev->txdesc_start) +
+			     index * adev->txdesc_size);
+}
+
+static inline 
+txdesc_t *acxpci_advance_txdesc(acx_device_t *adev, txdesc_t *txdesc,
+				int inc)
+{
+	return (txdesc_t *) (((u8 *) txdesc) + inc * adev->txdesc_size);
+}
+
-- 
1.7.8.1