Skip to contentSkip to conversation

b43: use pci_is_pcie() instead of obsolete pci_dev.is_pcie

PATCH New Bjorn Helgaas 2 participants 2 messages May 8, 2012 Networking drivers (wireless)

lore
Share & tools
lore

Bjorn Helgaas

author
#0 lore raw

PATCH 1/1 b43: use pci_is_pcie() instead of obsolete pci_dev.is_pcie

Use pci_is_pcie() instead of looking at obsolete is_pcie field in struct pci_dev.

CC Stefano Brivio <[email protected]>
CC b43-dev at lists.infradead.org
CC Kenji Kaneshige <[email protected]>
Signed-off-by Bjorn Helgaas <[email protected]>
---
 drivers/net/wireless/b43/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/dma.c +1 -1
index b5f1b91..777cd74 100644
@@ -1109,7 +1109,7 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev,
 #ifdef CONFIG_B43_SSB
 	if (dev->dev->bus_type == B43_BUS_SSB &&
 	    dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
-	    !(dev->dev->sdev->bus->host_pci->is_pcie &&
+	    !(pci_is_pcie(dev->dev->sdev->bus->host_pci) &&
 	      ssb_read32(dev->dev->sdev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64))
 			return 1;
 #endif
#1 lore raw

PATCH 1/1 b43: use pci_is_pcie() instead of obsolete pci_dev.is_pcie

Reviewed-by Kenji Kaneshige <[email protected]>

Regards,
Kenji Kaneshige

Quoted 26 lines · Bjorn Helgaas

Use pci_is_pcie() instead of looking at obsolete is_pcie field in struct pci_dev.

CC Stefano Brivio<[email protected]>
CC b43-dev at lists.infradead.org
CC Kenji Kaneshige<[email protected]>
Signed-off-by Bjorn Helgaas<[email protected]>
---
  drivers/net/wireless/b43/dma.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/b43/dma.c +1 -1
index b5f1b91..777cd74 100644
@@ -1109,7 +1109,7 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev,
  #ifdef CONFIG_B43_SSB
  	if (dev->dev->bus_type == B43_BUS_SSB&&
  	dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI&&
-	    !(dev->dev->sdev->bus->host_pci->is_pcie&&
+	    !(pci_is_pcie(dev->dev->sdev->bus->host_pci)&&
  	ssb_read32(dev->dev->sdev, SSB_TMSHIGH)&  SSB_TMSHIGH_DMA64))
  			return 1;
  #endif