FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 01:40:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stmmac: move driver data setting into stmmac_dvr_probe

Browse Source 
Move setting of driver data into stmmac_dvr_probe so the
other probe functions don't have to. This will help to
simplify the other probe functions later.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joachim Eastwood 2015-05-20 20:03:06 +02:00 committed by David S. Miller
parent 614919c3d9
commit 803f8fc462
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@ -2828,6 +2828,8 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
priv->ioaddr = addr; priv->ioaddr = addr;
priv->dev->base_addr = (unsigned long)addr; priv->dev->base_addr = (unsigned long)addr;
dev_set_drvdata(device, priv);
/* Verify driver arguments */ /* Verify driver arguments */
stmmac_verify_args(); stmmac_verify_args();

2
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
View File

@ -222,8 +222,6 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
priv->dev->irq = pdev->irq; priv->dev->irq = pdev->irq;
priv->wol_irq = pdev->irq; priv->wol_irq = pdev->irq;
pci_set_drvdata(pdev, priv->dev);
dev_dbg(&pdev->dev, "STMMAC PCI driver registration completed\n"); dev_dbg(&pdev->dev, "STMMAC PCI driver registration completed\n");
return 0; return 0;

2
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
View File

@ -350,8 +350,6 @@ int stmmac_pltfr_probe(struct platform_device *pdev)
if (mac) if (mac)
memcpy(priv->dev->dev_addr, mac, ETH_ALEN); memcpy(priv->dev->dev_addr, mac, ETH_ALEN);
platform_set_drvdata(pdev, priv->dev);
pr_debug("STMMAC platform driver registration completed"); pr_debug("STMMAC platform driver registration completed");
return 0; return 0;