a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ssb: allow compilation on systems without PCI

Browse Source 
Makes ssb work on system without a PCI bus.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Holger Schurig 2008-08-07 18:24:12 +02:00 committed by John W. Linville
parent e10e0dfe3b
commit 7f37441c21
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ssb/main.c
View File

@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation);
int ssb_dma_set_mask(struct ssb_device *dev, u64 mask) int ssb_dma_set_mask(struct ssb_device *dev, u64 mask)
{ {
#ifdef CONFIG_SSB_PCIHOST
int err; int err;
#endif
switch (dev->bus->bustype) { switch (dev->bus->bustype) {
case SSB_BUSTYPE_PCI: case SSB_BUSTYPE_PCI:
#ifdef CONFIG_SSB_PCIHOST
err = pci_set_dma_mask(dev->bus->host_pci, mask); err = pci_set_dma_mask(dev->bus->host_pci, mask);
if (err) if (err)
return err; return err;
err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask); err = pci_set_consistent_dma_mask(dev->bus->host_pci, mask);
return err; return err;
#endif
case SSB_BUSTYPE_SSB: case SSB_BUSTYPE_SSB:
return dma_set_mask(dev->dev, mask); return dma_set_mask(dev->dev, mask);
default: default:
@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
{ {
switch (dev->bus->bustype) { switch (dev->bus->bustype) {
case SSB_BUSTYPE_PCI: case SSB_BUSTYPE_PCI:
#ifdef CONFIG_SSB_PCIHOST
if (gfp_flags & GFP_DMA) { if (gfp_flags & GFP_DMA) {
/* Workaround: The PCI API does not support passing /* Workaround: The PCI API does not support passing
* a GFP flag. */ * a GFP flag. */
@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size,
size, dma_handle, gfp_flags); size, dma_handle, gfp_flags);
} }
return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle); return pci_alloc_consistent(dev->bus->host_pci, size, dma_handle);
#endif
case SSB_BUSTYPE_SSB: case SSB_BUSTYPE_SSB:
return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags); return dma_alloc_coherent(dev->dev, size, dma_handle, gfp_flags);
default: default:
@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
{ {
switch (dev->bus->bustype) { switch (dev->bus->bustype) {
case SSB_BUSTYPE_PCI: case SSB_BUSTYPE_PCI:
#ifdef CONFIG_SSB_PCIHOST
if (gfp_flags & GFP_DMA) { if (gfp_flags & GFP_DMA) {
/* Workaround: The PCI API does not support passing /* Workaround: The PCI API does not support passing
* a GFP flag. */ * a GFP flag. */
@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,
pci_free_consistent(dev->bus->host_pci, size, pci_free_consistent(dev->bus->host_pci, size,
vaddr, dma_handle); vaddr, dma_handle);
return; return;
#endif
case SSB_BUSTYPE_SSB: case SSB_BUSTYPE_SSB:
dma_free_coherent(dev->dev, size, vaddr, dma_handle); dma_free_coherent(dev->dev, size, vaddr, dma_handle);
return; return;