Skip to content

Commit 7ac2d77

Browse files
tititiou36kuba-moo
authored andcommitted
rocker: Remove useless DMA-32 fallback configuration
As stated in [1], dma_set_mask() with a 64-bit mask never fails if dev->dma_mask is non-NULL. So, if it fails, the 32 bits case will also fail for the same reason. Simplify code and remove some dead code accordingly. [1]: https://lkml.org/lkml/2021/6/7/398 Signed-off-by: Christophe JAILLET <[email protected]> Link: https://lore.kernel.org/r/9ba2d13099d216f3df83e50ad33a05504c90fe7c.1641744274.git.christophe.jaillet@wanadoo.fr Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 0044648 commit 7ac2d77

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

drivers/net/ethernet/rocker/rocker_main.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2870,19 +2870,10 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id)
28702870
goto err_pci_request_regions;
28712871
}
28722872

2873-
err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
2874-
if (!err) {
2875-
err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
2876-
if (err) {
2877-
dev_err(&pdev->dev, "dma_set_coherent_mask failed\n");
2878-
goto err_pci_set_dma_mask;
2879-
}
2880-
} else {
2881-
err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
2882-
if (err) {
2883-
dev_err(&pdev->dev, "dma_set_mask failed\n");
2884-
goto err_pci_set_dma_mask;
2885-
}
2873+
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
2874+
if (err) {
2875+
dev_err(&pdev->dev, "dma_set_mask failed\n");
2876+
goto err_pci_set_dma_mask;
28862877
}
28872878

28882879
if (pci_resource_len(pdev, 0) < ROCKER_PCI_BAR0_SIZE) {

0 commit comments

Comments
 (0)