瀏覽代碼

amd-xgbe: Remove manual check and set of dma_mask pointer

The underlying device support will set the device dma_mask pointer
if DMA is set up properly for the device.  Remove the check for and
assignment of dma_mask when it is null. Instead, just error out if
the dma_set_mask_and_coherent function fails because dma_mask is null.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Lendacky, Thomas 10 年之前
父節點
當前提交
fc7aabf007
共有 1 個文件被更改,包括 0 次插入2 次删除
  1. 0 2
      drivers/net/ethernet/amd/xgbe/xgbe-main.c

+ 0 - 2
drivers/net/ethernet/amd/xgbe/xgbe-main.c

@@ -678,8 +678,6 @@ static int xgbe_probe(struct platform_device *pdev)
 	xgbe_default_config(pdata);
 	xgbe_default_config(pdata);
 
 
 	/* Set the DMA mask */
 	/* Set the DMA mask */
-	if (!dev->dma_mask)
-		dev->dma_mask = &dev->coherent_dma_mask;
 	ret = dma_set_mask_and_coherent(dev,
 	ret = dma_set_mask_and_coherent(dev,
 					DMA_BIT_MASK(pdata->hw_feat.dma_width));
 					DMA_BIT_MASK(pdata->hw_feat.dma_width));
 	if (ret) {
 	if (ret) {