diff options
| author |   Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2015-05-14 11:44:33 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-05-15 15:21:44 -0400 |
| commit | fc7aabf0072fb9540f275f07afaf0724fbf6a176 (patch) | |
| tree | f251c7b58cee7fbab2699f475e03ff7ac5eaabe8 /drivers/net/ethernet/amd/xgbe/xgbe-main.c | |
| parent | amd-xgbe: Fix flow control setting logic (diff) | |
| download | linux-dev-fc7aabf0072fb9540f275f07afaf0724fbf6a176.tar.xz linux-dev-fc7aabf0072fb9540f275f07afaf0724fbf6a176.zip | |
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/xgbe/xgbe-main.c')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 |
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 34c521d8b578..fb7c961da49f 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) { |