Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfcfb545 authored May 08, 2012 by Bjorn Helgaas Committed by John W. Linville May 16, 2012

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 <stefano.brivio@polimi.it>
CC: b43-dev@lists.infradead.org
CC: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 2615f375

drivers/net/wireless/b43/dma.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1109,7 +1109,7 @@ static bool b43_dma_translation_in_low_word(struct b43_wldev *dev,
	#ifdef CONFIG_B43_SSB		#ifdef CONFIG_B43_SSB
	if (dev->dev->bus_type == B43_BUS_SSB &&		if (dev->dev->bus_type == B43_BUS_SSB &&
	dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&		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))		ssb_read32(dev->dev->sdev, SSB_TMSHIGH) & SSB_TMSHIGH_DMA64))
	return 1;		return 1;
	#endif		#endif