Skip to content

Commit cfcfc8f

Browse files
tititiou36kuba-moo
authored andcommitted
net: enetc: 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/dbecd4eb49a9586ee343b5473dda4b84c42112e9.1641742884.git.christophe.jaillet@wanadoo.fr Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 030f9ce commit cfcfc8f

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

drivers/net/ethernet/freescale/enetc/enetc.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,12 +2897,8 @@ int enetc_pci_probe(struct pci_dev *pdev, const char *name, int sizeof_priv)
28972897
/* set up for high or low dma */
28982898
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
28992899
if (err) {
2900-
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
2901-
if (err) {
2902-
dev_err(&pdev->dev,
2903-
"DMA configuration failed: 0x%x\n", err);
2904-
goto err_dma;
2905-
}
2900+
dev_err(&pdev->dev, "DMA configuration failed: 0x%x\n", err);
2901+
goto err_dma;
29062902
}
29072903

29082904
err = pci_request_mem_regions(pdev, name);

drivers/net/ethernet/freescale/enetc/enetc_ptp.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,10 @@ static int enetc_ptp_probe(struct pci_dev *pdev,
4242
if (err)
4343
return dev_err_probe(&pdev->dev, err, "device enable failed\n");
4444

45-
/* set up for high or low dma */
4645
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
4746
if (err) {
48-
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
49-
if (err) {
50-
dev_err(&pdev->dev,
51-
"DMA configuration failed: 0x%x\n", err);
52-
goto err_dma;
53-
}
47+
dev_err(&pdev->dev, "DMA configuration failed: 0x%x\n", err);
48+
goto err_dma;
5449
}
5550

5651
err = pci_request_mem_regions(pdev, KBUILD_MODNAME);

0 commit comments

Comments
 (0)