git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mISDN: switch from 'pci_' to 'dma_' API
[sfrench/cifs-2.6.git]
/
drivers
/
isdn
/
hardware
/
mISDN
/
netjet.c
diff --git
a/drivers/isdn/hardware/mISDN/netjet.c
b/drivers/isdn/hardware/mISDN/netjet.c
index 6aae97e827b72f3b9b81ff508ff32317878f0277..ee925b58bbcea7ab0a411069cc5b394f3b276165 100644
(file)
--- a/
drivers/isdn/hardware/mISDN/netjet.c
+++ b/
drivers/isdn/hardware/mISDN/netjet.c
@@
-297,8
+297,8
@@
inittiger(struct tiger_hw *card)
{
int i;
{
int i;
- card->dma_p =
pci_alloc_consistent(card->p
dev, NJ_DMA_SIZE,
-
&card->dma
);
+ card->dma_p =
dma_alloc_coherent(&card->pdev->
dev, NJ_DMA_SIZE,
+
&card->dma, GFP_ATOMIC
);
if (!card->dma_p) {
pr_info("%s: No DMA memory\n", card->name);
return -ENOMEM;
if (!card->dma_p) {
pr_info("%s: No DMA memory\n", card->name);
return -ENOMEM;
@@
-965,8
+965,8
@@
nj_release(struct tiger_hw *card)
kfree(card->bc[i].hrbuf);
}
if (card->dma_p)
kfree(card->bc[i].hrbuf);
}
if (card->dma_p)
-
pci_free_consistent(card->pdev, NJ_DMA_SIZE
,
-
card->dma_p,
card->dma);
+
dma_free_coherent(&card->pdev->dev, NJ_DMA_SIZE, card->dma_p
,
+ card->dma);
write_lock_irqsave(&card_lock, flags);
list_del(&card->list);
write_unlock_irqrestore(&card_lock, flags);
write_lock_irqsave(&card_lock, flags);
list_del(&card->list);
write_unlock_irqrestore(&card_lock, flags);