Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
memstick
/
host
/
r592.c
diff --git
a/kernel/drivers/memstick/host/r592.c
b/kernel/drivers/memstick/host/r592.c
index
e2a4f5f
..
ef09ba0
100644
(file)
--- a/
kernel/drivers/memstick/host/r592.c
+++ b/
kernel/drivers/memstick/host/r592.c
@@
-754,7
+754,7
@@
static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto error2;
pci_set_master(pdev);
goto error2;
pci_set_master(pdev);
- error =
pci_set_dma_mask(p
dev, DMA_BIT_MASK(32));
+ error =
dma_set_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (error)
goto error3;
if (error)
goto error3;
@@
-787,8
+787,8
@@
static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
}
/* This is just a precation, so don't fail */
}
/* This is just a precation, so don't fail */
- dev->dummy_dma_page =
pci_alloc_consistent(p
dev, PAGE_SIZE,
- &dev->dummy_dma_page_physical_address);
+ dev->dummy_dma_page =
dma_alloc_coherent(&pdev->
dev, PAGE_SIZE,
+ &dev->dummy_dma_page_physical_address
, GFP_KERNEL
);
r592_stop_dma(dev , 0);
if (request_irq(dev->irq, &r592_irq, IRQF_SHARED,
r592_stop_dma(dev , 0);
if (request_irq(dev->irq, &r592_irq, IRQF_SHARED,
@@
-805,7
+805,7
@@
error7:
free_irq(dev->irq, dev);
error6:
if (dev->dummy_dma_page)
free_irq(dev->irq, dev);
error6:
if (dev->dummy_dma_page)
-
pci_free_consistent(p
dev, PAGE_SIZE, dev->dummy_dma_page,
+
dma_free_coherent(&pdev->
dev, PAGE_SIZE, dev->dummy_dma_page,
dev->dummy_dma_page_physical_address);
kthread_stop(dev->io_thread);
dev->dummy_dma_page_physical_address);
kthread_stop(dev->io_thread);
@@
-845,7
+845,7
@@
static void r592_remove(struct pci_dev *pdev)
memstick_free_host(dev->host);
if (dev->dummy_dma_page)
memstick_free_host(dev->host);
if (dev->dummy_dma_page)
-
pci_free_consistent(p
dev, PAGE_SIZE, dev->dummy_dma_page,
+
dma_free_coherent(&pdev->
dev, PAGE_SIZE, dev->dummy_dma_page,
dev->dummy_dma_page_physical_address);
}
dev->dummy_dma_page_physical_address);
}