Commit bde3c8ff authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

gve: Simplify code and axe the use of a deprecated API 



The wrappers in include/linux/pci-dma-compat.h should go away.

Replace 'pci_set_dma_mask/pci_set_consistent_dma_mask' by an equivalent
and less verbose 'dma_set_mask_and_coherent()' call.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarCatherine Sullivan <csully@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 633fa666

drivers/net/ethernet/google/gve/gve_main.c

+1 −8
Original line number Diff line number Diff line
@@ -1477,19 +1477,12 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	pci_set_master(pdev);



	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (err) {

		dev_err(&pdev->dev, "Failed to set dma mask: err=%d\n", err);

		goto abort_with_pci_region;

	}



	err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	if (err) {

		dev_err(&pdev->dev,

			"Failed to set consistent dma mask: err=%d\n", err);

		goto abort_with_pci_region;

	}



	reg_bar = pci_iomap(pdev, GVE_REGISTER_BAR, 0);

	if (!reg_bar) {

		dev_err(&pdev->dev, "Failed to map pci bar!\n");