Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[mirror_ubuntu-jammy-kernel.git] / drivers / net / ethernet / ec_bhf.c

diff --git a/drivers/net/ethernet/ec_bhf.c b/drivers/net/ethernet/ec_bhf.c
index 7c992172933bc075d4a8036899edd07b497720ee..b2d4fb3feb74482b8541f2edac695ad9a6a53400 100644 (file)
--- a/drivers/net/ethernet/ec_bhf.c
+++ b/drivers/net/ethernet/ec_bhf.c
@@ -488,15 +488,7 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
        pci_set_master(dev);
 
-       err = pci_set_dma_mask(dev, DMA_BIT_MASK(32));
-       if (err) {
-               dev_err(&dev->dev,
-                       "Required dma mask not supported, failed to initialize device\n");
-               err = -EIO;
-               goto err_disable_dev;
-       }
-
-       err = pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(32));
+       err = dma_set_mask_and_coherent(&dev->dev, DMA_BIT_MASK(32));
        if (err) {
                dev_err(&dev->dev,
                        "Required dma mask not supported, failed to initialize device\n");