DMA-API: net: emulex/benet: replace dma_set_mask()+dma_set_coherent_mask() with new helper

Replace the following sequence:

	dma_set_mask(dev, mask);
	dma_set_coherent_mask(dev, mask);

with a call to the new helper dma_set_mask_and_coherent().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 3224d28cdad4..208415107418 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4335,19 +4335,11 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
         adapter->netdev = netdev;
         SET_NETDEV_DEV(netdev, &pdev->dev);
 
-        status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+        status = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
         if (!status) {
-                status = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
-                if (status < 0) {
-                        dev_err(&pdev->dev, "dma_set_coherent_mask failed\n");
-                        goto free_netdev;
-                }
                 netdev->features |= NETIF_F_HIGHDMA;
         } else {
-                status = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-                if (!status)
-                        status = dma_set_coherent_mask(&pdev->dev,
-                                                       DMA_BIT_MASK(32));
+                status = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
                 if (status) {
                         dev_err(&pdev->dev, "Could not set PCI DMA Mask\n");
                         goto free_netdev;