net: pch_gbe: Use dma_set_mask_and_coherent to simplify code (8ff39301) · Commits · 戴 / test

'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by an equivalent 'dma_set_mask_and_coherent()' which is much less verbose. Signed-off-by:

Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/20201121090302.1332491-1-christophe.jaillet@wanadoo.fr Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -2502,19 +2502,13 @@ static int pch_gbe_probe(struct pci_dev *pdev,
		if (ret)
		return ret;

		if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))
		\|\| pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
		if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64))) {
		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
		if (ret) {
		ret = pci_set_consistent_dma_mask(pdev,
		DMA_BIT_MASK(32));
		if (ret) {
		dev_err(&pdev->dev, "ERR: No usable DMA "
		"configuration, aborting\n");
		dev_err(&pdev->dev, "ERR: No usable DMA configuration, aborting\n");
		return ret;
		}
		}
		}

		ret = pcim_iomap_regions(pdev, 1 << PCH_GBE_PCI_BAR, pci_name(pdev));
		if (ret) {

Admin message