summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/amd
diff options
context:
space:
mode:
authorLendacky, Thomas <Thomas.Lendacky@amd.com>2015-05-14 11:44:33 -0500
committerDavid S. Miller <davem@davemloft.net>2015-05-15 15:21:44 -0400
commitfc7aabf0072fb9540f275f07afaf0724fbf6a176 (patch)
treef251c7b58cee7fbab2699f475e03ff7ac5eaabe8 /drivers/net/ethernet/amd
parentc1ce2f77366bb7cde153596e9406fc7727d5726c (diff)
downloadop-kernel-dev-fc7aabf0072fb9540f275f07afaf0724fbf6a176.zip
op-kernel-dev-fc7aabf0072fb9540f275f07afaf0724fbf6a176.tar.gz
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>
Diffstat (limited to 'drivers/net/ethernet/amd')
-rw-r--r--drivers/net/ethernet/amd/xgbe/xgbe-main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
index 34c521d..fb7c961d 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
@@ -678,8 +678,6 @@ static int xgbe_probe(struct platform_device *pdev)
xgbe_default_config(pdata);
/* Set the DMA mask */
- if (!dev->dma_mask)
- dev->dma_mask = &dev->coherent_dma_mask;
ret = dma_set_mask_and_coherent(dev,
DMA_BIT_MASK(pdata->hw_feat.dma_width));
if (ret) {
OpenPOWER on IntegriCloud