| .. | .. |
|---|
| 627 | 627 | |
|---|
| 628 | 628 | /* Set up I/O base address. */ |
|---|
| 629 | 629 | if (dfx_use_mmio) { |
|---|
| 630 | | - bp->base.mem = ioremap_nocache(bar_start[0], bar_len[0]); |
|---|
| 630 | + bp->base.mem = ioremap(bar_start[0], bar_len[0]); |
|---|
| 631 | 631 | if (!bp->base.mem) { |
|---|
| 632 | 632 | printk(KERN_ERR "%s: Cannot map MMIO\n", print_name); |
|---|
| 633 | 633 | err = -ENOMEM; |
|---|
| .. | .. |
|---|
| 1152 | 1152 | #endif |
|---|
| 1153 | 1153 | sizeof(PI_CONSUMER_BLOCK) + |
|---|
| 1154 | 1154 | (PI_ALIGN_K_DESC_BLK - 1); |
|---|
| 1155 | | - bp->kmalloced = top_v = dma_zalloc_coherent(bp->bus_dev, alloc_size, |
|---|
| 1156 | | - &bp->kmalloced_dma, |
|---|
| 1157 | | - GFP_ATOMIC); |
|---|
| 1155 | + bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size, |
|---|
| 1156 | + &bp->kmalloced_dma, |
|---|
| 1157 | + GFP_ATOMIC); |
|---|
| 1158 | 1158 | if (top_v == NULL) |
|---|
| 1159 | 1159 | return DFX_K_FAILURE; |
|---|
| 1160 | 1160 | |
|---|
| .. | .. |
|---|
| 3525 | 3525 | bp->descr_block_virt->xmt_data[comp].long_1, |
|---|
| 3526 | 3526 | p_xmt_drv_descr->p_skb->len, |
|---|
| 3527 | 3527 | DMA_TO_DEVICE); |
|---|
| 3528 | | - dev_kfree_skb_irq(p_xmt_drv_descr->p_skb); |
|---|
| 3528 | + dev_consume_skb_irq(p_xmt_drv_descr->p_skb); |
|---|
| 3529 | 3529 | |
|---|
| 3530 | 3530 | /* |
|---|
| 3531 | 3531 | * Move to start of next packet by updating completion index |
|---|