1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/ethernet/sfc/nic.c b/drivers/net/ethernet/sfc/nic.c
index 4a9a5beec8fc..326d799762d6 100644
--- a/drivers/net/ethernet/sfc/nic.c
+++ b/drivers/net/ethernet/sfc/nic.c
@@ -124,9 +124,6 @@ int efx_nic_test_registers(struct efx_nic *efx,
         unsigned address = 0, i, j;
         efx_oword_t mask, imask, original, reg, buf;
 
-        /* Falcon should be in loopback to isolate the XMAC from the PHY */
-        WARN_ON(!LOOPBACK_INTERNAL(efx));
-
         for (i = 0; i < n_regs; ++i) {
                 address = regs[i].address;
                 mask = imask = regs[i].mask;
@@ -308,8 +305,8 @@ efx_free_special_buffer(struct efx_nic *efx, struct efx_special_buffer *buffer)
 int efx_nic_alloc_buffer(struct efx_nic *efx, struct efx_buffer *buffer,
                          unsigned int len)
 {
-        buffer->addr = pci_alloc_consistent(efx->pci_dev, len,
-                                            &buffer->dma_addr);
+        buffer->addr = dma_alloc_coherent(&efx->pci_dev->dev, len,
+                                          &buffer->dma_addr, GFP_ATOMIC);
         if (!buffer->addr)
                 return -ENOMEM;
         buffer->len = len;
@@ -320,8 +317,8 @@ int efx_nic_alloc_buffer(struct efx_nic *efx, struct efx_buffer *buffer,
 void efx_nic_free_buffer(struct efx_nic *efx, struct efx_buffer *buffer)
 {
         if (buffer->addr) {
-                pci_free_consistent(efx->pci_dev, buffer->len,
-                                    buffer->addr, buffer->dma_addr);
+                dma_free_coherent(&efx->pci_dev->dev, buffer->len,
+                                  buffer->addr, buffer->dma_addr);
                 buffer->addr = NULL;
         }
 }