[PATCH] skge: dma configuration cleanup
Cleanup of the part of the code that sets up DMA configuration. Should cause no real change in operation, just clearer. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Родитель
c3da144740
Коммит
93aea718c6
|
@ -3251,23 +3251,19 @@ static int __devinit skge_probe(struct pci_dev *pdev,
|
||||||
|
|
||||||
pci_set_master(pdev);
|
pci_set_master(pdev);
|
||||||
|
|
||||||
if (sizeof(dma_addr_t) > sizeof(u32) &&
|
if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
|
||||||
!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
|
|
||||||
using_dac = 1;
|
using_dac = 1;
|
||||||
err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
|
err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
|
||||||
if (err < 0) {
|
} else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
|
||||||
printk(KERN_ERR PFX "%s unable to obtain 64 bit DMA "
|
using_dac = 0;
|
||||||
"for consistent allocations\n", pci_name(pdev));
|
err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
|
||||||
goto err_out_free_regions;
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
|
||||||
if (err) {
|
if (err) {
|
||||||
printk(KERN_ERR PFX "%s no usable DMA configuration\n",
|
printk(KERN_ERR PFX "%s no usable DMA configuration\n",
|
||||||
pci_name(pdev));
|
pci_name(pdev));
|
||||||
goto err_out_free_regions;
|
goto err_out_free_regions;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef __BIG_ENDIAN
|
#ifdef __BIG_ENDIAN
|
||||||
/* byte swap descriptors in hardware */
|
/* byte swap descriptors in hardware */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче