aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoachim Eastwood <manabian@gmail.com>2015-05-20 20:03:06 +0200
committerDavid S. Miller <davem@davemloft.net>2015-05-21 18:57:26 -0400
commit803f8fc46274bbd15757961be44a58ea6f3032d4 (patch)
treeabf911b9abef530b3864c117555f2b5cbc511aa3 /drivers
parent614919c3d9b38465e0aa377312f3f015fdd228b6 (diff)
stmmac: move driver data setting into stmmac_dvr_probe
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c2
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c2
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c2
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 42e1492ea845..396eb59768be 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2828,6 +2828,8 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device,
priv->ioaddr = addr;
priv->dev->base_addr = (unsigned long)addr;
+ dev_set_drvdata(device, priv);
+
/* Verify driver arguments */
stmmac_verify_args();
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 3bca908716e2..4743d0017d79 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -222,8 +222,6 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
priv->dev->irq = pdev->irq;
priv->wol_irq = pdev->irq;
- pci_set_drvdata(pdev, priv->dev);
-
dev_dbg(&pdev->dev, "STMMAC PCI driver registration completed\n");
return 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 3e194c3ca297..8d7e160c2c5b 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -350,8 +350,6 @@ int stmmac_pltfr_probe(struct platform_device *pdev)
if (mac)
memcpy(priv->dev->dev_addr, mac, ETH_ALEN);
- platform_set_drvdata(pdev, priv->dev);
-
pr_debug("STMMAC platform driver registration completed");
return 0;

Privacy Policy