[PATCH] libertas: indirect all hardware access via hw_XXXX functions

This functions makes all libertas_sbi_XXX functions static to the
if_usb.c file and renames them to if_usb_XXXX(). The get called from
other places of the source code via priv->hw_XXXX().

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/tx.c b/drivers/net/wireless/libertas/tx.c
index e61729f0645a..1993e8e79c45 100644
--- a/drivers/net/wireless/libertas/tx.c
+++ b/drivers/net/wireless/libertas/tx.c
@@ -5,7 +5,6 @@
 
 #include "hostcmd.h"
 #include "radiotap.h"
-#include "sbi.h"
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
@@ -132,13 +131,13 @@ static int SendSinglePacket(wlan_private * priv, struct sk_buff *skb)
 
         lbs_dbg_hex("Tx Data", (u8 *) p802x_hdr, plocaltxpd->tx_packet_length);
         memcpy(ptr, p802x_hdr, plocaltxpd->tx_packet_length);
-        ret = libertas_sbi_host_to_card(priv, MVMS_DAT,
-                               priv->adapter->tmptxbuf,
-                               plocaltxpd->tx_packet_length +
-                               sizeof(struct txpd));
+        ret = priv->hw_host_to_card(priv, MVMS_DAT,
+                priv->adapter->tmptxbuf,
+                plocaltxpd->tx_packet_length +
+                sizeof(struct txpd));
 
         if (ret) {
-                lbs_deb_tx("tx err: libertas_sbi_host_to_card returned 0x%X\n", ret);
+                lbs_deb_tx("tx err: hw_host_to_card returned 0x%X\n", ret);
                 goto done;
         }