diff options
| author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2012-02-15 00:10:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-15 14:52:10 -0500 |
| commit | cf3f047b9af49d4ee8abfa31b0ef0e99cbcaf17d (patch) | |
| tree | 695883ca9df55d62ee83d35fc86a37e47bcb04f6 /drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | |
| parent | 7a13f8f5b63652c035147aab5fcba7ee9101f1fb (diff) | |
| download | talos-op-linux-cf3f047b9af49d4ee8abfa31b0ef0e99cbcaf17d.tar.gz talos-op-linux-cf3f047b9af49d4ee8abfa31b0ef0e99cbcaf17d.zip | |
stmmac: move hw init in the probe (v2)
This patch moves the MAC HW initialization and
the HW feature verification from the open to the probe
function as D. Miller suggested.
So the patch actually reorganizes and tidies-up some parts of
the driver and indeed fixes some problem when tune its HW features.
These can be overwritten by looking at the HW cap register at
run-time and that generated problems.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: Francesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index c796de9eed72..50ad5b80cfaf 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -96,13 +96,11 @@ static int __devinit stmmac_pci_probe(struct pci_dev *pdev, stmmac_default_data(); - priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat); + priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat, addr); if (!priv) { - pr_err("%s: main drivr probe failed", __func__); + pr_err("%s: main driver probe failed", __func__); goto err_out; } - priv->ioaddr = addr; - priv->dev->base_addr = (unsigned long)addr; priv->dev->irq = pdev->irq; priv->wol_irq = pdev->irq; |
