b43: bus: abstract 80211 core info

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
index 72ab94df7569..44da620d9cc2 100644
--- a/drivers/net/wireless/b43/pio.c
+++ b/drivers/net/wireless/b43/pio.c
@@ -111,7 +111,7 @@ static u16 index_to_pioqueue_base(struct b43_wldev *dev,
                 B43_MMIO_PIO11_BASE5,
         };
 
-        if (dev->sdev->id.revision >= 11) {
+        if (dev->dev->core_rev >= 11) {
                 B43_WARN_ON(index >= ARRAY_SIZE(bases_rev11));
                 return bases_rev11[index];
         }
@@ -121,14 +121,14 @@ static u16 index_to_pioqueue_base(struct b43_wldev *dev,
 
 static u16 pio_txqueue_offset(struct b43_wldev *dev)
 {
-        if (dev->sdev->id.revision >= 11)
+        if (dev->dev->core_rev >= 11)
                 return 0x18;
         return 0;
 }
 
 static u16 pio_rxqueue_offset(struct b43_wldev *dev)
 {
-        if (dev->sdev->id.revision >= 11)
+        if (dev->dev->core_rev >= 11)
                 return 0x38;
         return 8;
 }
@@ -144,7 +144,7 @@ static struct b43_pio_txqueue *b43_setup_pioqueue_tx(struct b43_wldev *dev,
         if (!q)
                 return NULL;
         q->dev = dev;
-        q->rev = dev->sdev->id.revision;
+        q->rev = dev->dev->core_rev;
         q->mmio_base = index_to_pioqueue_base(dev, index) +
                        pio_txqueue_offset(dev);
         q->index = index;
@@ -178,7 +178,7 @@ static struct b43_pio_rxqueue *b43_setup_pioqueue_rx(struct b43_wldev *dev,
         if (!q)
                 return NULL;
         q->dev = dev;
-        q->rev = dev->sdev->id.revision;
+        q->rev = dev->dev->core_rev;
         q->mmio_base = index_to_pioqueue_base(dev, index) +
                        pio_rxqueue_offset(dev);