diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2022-01-09 18:29:51 +0100 |
|---|---|---|
| committer |   Tony Nguyen <anthony.l.nguyen@intel.com> | 2022-01-27 08:58:24 -0800 |
| commit | 10ebc5464e4004ac186c922956a317d6e668cc61 (patch) | |
| tree | fcb87c2f81c5a2dfa70b8b1e6f568a5e1220c770 /drivers/net/ethernet/intel/i40e/i40e_main.c | |
| parent | ixgbevf: Remove useless DMA-32 fallback configuration (diff) | |
| download | linux-dev-10ebc5464e4004ac186c922956a317d6e668cc61.tar.xz linux-dev-10ebc5464e4004ac186c922956a317d6e668cc61.zip | |
i40e: 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 <christophe.jaillet@wanadoo.fr>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alexander Lobakin <alexandr.lobakin@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index f70c478dafdb..c8834765c864 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -15322,12 +15322,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* set up for high or low dma */ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (err) { - err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); - if (err) { - dev_err(&pdev->dev, - "DMA configuration failed: 0x%x\n", err); - goto err_dma; - } + dev_err(&pdev->dev, + "DMA configuration failed: 0x%x\n", err); + goto err_dma; } /* set up pci connections */ |