diff options
Diffstat (limited to 'drivers/net/benet/be_ethtool.c')
-rw-r--r-- | drivers/net/benet/be_ethtool.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c index 51e1065e7897..200e98515909 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/benet/be_ethtool.c | |||
@@ -276,8 +276,6 @@ be_get_ethtool_stats(struct net_device *netdev, | |||
276 | data[i] = (et_stats[i].size == sizeof(u64)) ? | 276 | data[i] = (et_stats[i].size == sizeof(u64)) ? |
277 | *(u64 *)p: *(u32 *)p; | 277 | *(u64 *)p: *(u32 *)p; |
278 | } | 278 | } |
279 | |||
280 | return; | ||
281 | } | 279 | } |
282 | 280 | ||
283 | static void | 281 | static void |
@@ -466,7 +464,6 @@ be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
466 | else | 464 | else |
467 | wol->wolopts = 0; | 465 | wol->wolopts = 0; |
468 | memset(&wol->sopass, 0, sizeof(wol->sopass)); | 466 | memset(&wol->sopass, 0, sizeof(wol->sopass)); |
469 | return; | ||
470 | } | 467 | } |
471 | 468 | ||
472 | static int | 469 | static int |
@@ -496,7 +493,7 @@ be_test_ddr_dma(struct be_adapter *adapter) | |||
496 | ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size, | 493 | ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size, |
497 | &ddrdma_cmd.dma); | 494 | &ddrdma_cmd.dma); |
498 | if (!ddrdma_cmd.va) { | 495 | if (!ddrdma_cmd.va) { |
499 | dev_err(&adapter->pdev->dev, "Memory allocation failure \n"); | 496 | dev_err(&adapter->pdev->dev, "Memory allocation failure\n"); |
500 | return -ENOMEM; | 497 | return -ENOMEM; |
501 | } | 498 | } |
502 | 499 | ||