Merge branch 'renesas-dma-channel'

Sergei Shtylyov says: ==================== Fix DMA channel misreporting for the Renesas Ethernet drivers Here's a set of 2 patches against DaveM's 'net.git' repo fixing up the DMA channel reporting by 'ifconfig'... ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
mariux64 · Jul 19, 2016 · bcf77d5 · bcf77d5
2 parents eab8146 + 3c78658
commit bcf77d5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1908,7 +1908,6 @@ static int ravb_probe(struct platform_device *pdev)
 
 	/* The Ether-specific entries in the device structure. */
 	ndev->base_addr = res->start;
-	ndev->dma = -1;
 
 	chip_id = (enum ravb_chip_id)of_device_get_match_data(&pdev->dev);
 

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2996,7 +2996,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
 	if (devno < 0)
 		devno = 0;
 
-	ndev->dma = -1;
 	ret = platform_get_irq(pdev, 0);
 	if (ret < 0)
 		goto out_release;