cw1200: Rename 'sbus' to 'hwbus'
This avoids problems when building on SPARC targets due to the driver
calling the bus abstraction layer 'sbus'. Not that any SBUS-sporting
SPARC targets are likely to have an SDIO controller, but this is the
correct thing to do.
See http://kisskb.ellerman.id.au/kisskb/buildresult/8846508/
Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/cw1200/bh.c b/drivers/net/wireless/cw1200/bh.c
index cf7375f..324b570 100644
--- a/drivers/net/wireless/cw1200/bh.c
+++ b/drivers/net/wireless/cw1200/bh.c
@@ -23,7 +23,7 @@
#include "bh.h"
#include "hwio.h"
#include "wsm.h"
-#include "sbus.h"
+#include "hwbus.h"
#include "debug.h"
#include "fwio.h"
@@ -103,7 +103,7 @@
pr_debug("[BH] irq.\n");
/* Disable Interrupts! */
- /* NOTE: sbus_ops->lock already held */
+ /* NOTE: hwbus_ops->lock already held */
__cw1200_irq_enable(priv, 0);
if (/* WARN_ON */(priv->bh_error))
@@ -265,8 +265,8 @@
* to the NEXT Message length + 2 Bytes for SKB */
read_len = read_len + 2;
- alloc_len = priv->sbus_ops->align_size(
- priv->sbus_priv, read_len);
+ alloc_len = priv->hwbus_ops->align_size(
+ priv->hwbus_priv, read_len);
/* Check if not exceeding CW1200 capabilities */
if (WARN_ON_ONCE(alloc_len > EFFECTIVE_BUF_SIZE)) {
@@ -384,8 +384,8 @@
atomic_add(1, &priv->bh_tx);
- tx_len = priv->sbus_ops->align_size(
- priv->sbus_priv, tx_len);
+ tx_len = priv->hwbus_ops->align_size(
+ priv->hwbus_priv, tx_len);
/* Check if not exceeding CW1200 capabilities */
if (WARN_ON_ONCE(tx_len > EFFECTIVE_BUF_SIZE))
@@ -597,15 +597,15 @@
done:
/* Re-enable device interrupts */
- priv->sbus_ops->lock(priv->sbus_priv);
+ priv->hwbus_ops->lock(priv->hwbus_priv);
__cw1200_irq_enable(priv, 1);
- priv->sbus_ops->unlock(priv->sbus_priv);
+ priv->hwbus_ops->unlock(priv->hwbus_priv);
}
/* Explicitly disable device interrupts */
- priv->sbus_ops->lock(priv->sbus_priv);
+ priv->hwbus_ops->lock(priv->hwbus_priv);
__cw1200_irq_enable(priv, 0);
- priv->sbus_ops->unlock(priv->sbus_priv);
+ priv->hwbus_ops->unlock(priv->hwbus_priv);
if (!term) {
pr_err("[BH] Fatal error, exiting.\n");