diff options
| -rw-r--r-- | drivers/net/ibmveth.c | 16 | ||||
| -rw-r--r-- | include/asm-ppc64/vio.h | 5 |
2 files changed, 8 insertions, 13 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 6427a25c2719..3da41374a127 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c @@ -404,7 +404,7 @@ static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter) static void ibmveth_cleanup(struct ibmveth_adapter *adapter) { if(adapter->buffer_list_addr != NULL) { - if(!vio_dma_mapping_error(adapter->buffer_list_dma)) { + if(!dma_mapping_error(adapter->buffer_list_dma)) { vio_unmap_single(adapter->vdev, adapter->buffer_list_dma, 4096, DMA_BIDIRECTIONAL); adapter->buffer_list_dma = DMA_ERROR_CODE; } @@ -413,7 +413,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter) } if(adapter->filter_list_addr != NULL) { - if(!vio_dma_mapping_error(adapter->filter_list_dma)) { + if(!dma_mapping_error(adapter->filter_list_dma)) { vio_unmap_single(adapter->vdev, adapter->filter_list_dma, 4096, DMA_BIDIRECTIONAL); adapter->filter_list_dma = DMA_ERROR_CODE; } @@ -422,7 +422,7 @@ static void ibmveth_cleanup(struct ibmveth_adapter *adapter) } if(adapter->rx_queue.queue_addr != NULL) { - if(!vio_dma_mapping_error(adapter->rx_queue.queue_dma)) { + if(!dma_mapping_error(adapter->rx_queue.queue_dma)) { vio_unmap_single(adapter->vdev, adapter->rx_queue.queue_dma, adapter->rx_queue.queue_len, DMA_BIDIRECTIONAL); adapter->rx_queue.queue_dma = DMA_ERROR_CODE; } @@ -473,9 +473,9 @@ static int ibmveth_open(struct net_device *netdev) adapter->filter_list_dma = vio_map_single(adapter->vdev, adapter->filter_list_addr, 4096, DMA_BIDIRECTIONAL); adapter->rx_queue.queue_dma = vio_map_single(adapter->vdev, adapter->rx_queue.queue_addr, adapter->rx_queue.queue_len, DMA_BIDIRECTIONAL); - if((vio_dma_mapping_error(adapter->buffer_list_dma) ) || - (vio_dma_mapping_error(adapter->filter_list_dma)) || - (vio_dma_mapping_error(adapter->rx_queue.queue_dma))) { + if((dma_mapping_error(adapter->buffer_list_dma) ) || + (dma_mapping_error(adapter->filter_list_dma)) || + (dma_mapping_error(adapter->rx_queue.queue_dma))) { ibmveth_error_printk("unable to map filter or buffer list pages\n"); ibmveth_cleanup(adapter); return -ENOMEM; @@ -644,7 +644,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) desc[0].fields.address = vio_map_single(adapter->vdev, skb->data, desc[0].fields.length, PCI_DMA_TODEVICE); desc[0].fields.valid = 1; - if(vio_dma_mapping_error(desc[0].fields.address)) { + if(dma_mapping_error(desc[0].fields.address)) { ibmveth_error_printk("tx: unable to map initial fragment\n"); adapter->tx_map_failed++; adapter->stats.tx_dropped++; @@ -663,7 +663,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) desc[curfrag+1].fields.length = frag->size; desc[curfrag+1].fields.valid = 1; - if(vio_dma_mapping_error(desc[curfrag+1].fields.address)) { + if(dma_mapping_error(desc[curfrag+1].fields.address)) { ibmveth_error_printk("tx: unable to map fragment %d\n", curfrag); adapter->tx_map_failed++; adapter->stats.tx_dropped++; diff --git a/include/asm-ppc64/vio.h b/include/asm-ppc64/vio.h index 7fe3a23736e7..107201b25008 100644 --- a/include/asm-ppc64/vio.h +++ b/include/asm-ppc64/vio.h @@ -137,9 +137,4 @@ static inline struct vio_dev *to_vio_dev(struct device *dev) return container_of(dev, struct vio_dev, dev); } -static inline int vio_dma_mapping_error(dma_addr_t dma_addr) -{ - return dma_mapping_error(dma_addr); -} - #endif /* _ASM_VIO_H */ |