Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13cb8a58 authored by Robin Murphy's avatar Robin Murphy Committed by Kalle Valo
Browse files

qtnfmac: Tidy up DMA mask setting 



As the only caller of dma_supported() outside of DMA API internals, the
qtfnmac driver stands out and invites scrutiny. Thankfully, it's not
being used for evil, but it is entirely redundant, since it open-codes a
check that the DMA mask setting functions are going to perform anyway.
In fact, the whole qtnf_pcie_init_dma_mask() function is nothing more
than a rather long-winded implementation of dma_set_mask_and_coherent(),
so let's just use that directly.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Acked-by: default avatarSergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 805b28c0

drivers/net/wireless/quantenna/qtnfmac/pearl/pcie.c

+1 −27
Original line number Diff line number Diff line
@@ -274,32 +274,6 @@ static int qtnf_pcie_init_memory(struct qtnf_pcie_bus_priv *priv) 
	return 0;

}



static int

qtnf_pcie_init_dma_mask(struct qtnf_pcie_bus_priv *priv, u64 dma_mask)

{

	int ret;



	ret = dma_supported(&priv->pdev->dev, dma_mask);

	if (!ret) {

		pr_err("DMA mask %llu not supported\n", dma_mask);

		return ret;

	}



	ret = pci_set_dma_mask(priv->pdev, dma_mask);

	if (ret) {

		pr_err("failed to set DMA mask %llu\n", dma_mask);

		return ret;

	}



	ret = pci_set_consistent_dma_mask(priv->pdev, dma_mask);

	if (ret) {

		pr_err("failed to set consistent DMA mask %llu\n", dma_mask);

		return ret;

	}



	return ret;

}



static void qtnf_tune_pcie_mps(struct qtnf_pcie_bus_priv *priv)

{

	struct pci_dev *pdev = priv->pdev;
@@ -1212,7 +1186,7 @@ static int qtnf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err_base;

	}



	ret = qtnf_pcie_init_dma_mask(pcie_priv, DMA_BIT_MASK(32));

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (ret) {

		pr_err("PCIE DMA mask init failed\n");

		goto err_base;