These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / ethernet / stmicro / stmmac / stmmac_pci.c

diff --git a/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 3bca908..d71a721 100644 (file)
--- a/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/kernel/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -163,7 +163,7 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
 {
        struct stmmac_pci_info *info = (struct stmmac_pci_info *)id->driver_data;
        struct plat_stmmacenet_data *plat;
-       struct stmmac_priv *priv;
+       struct stmmac_resources res;
        int i;
        int ret;
 
@@ -214,19 +214,12 @@ static int stmmac_pci_probe(struct pci_dev *pdev,
 
        pci_enable_msi(pdev);
 
-       priv = stmmac_dvr_probe(&pdev->dev, plat, pcim_iomap_table(pdev)[i]);
-       if (IS_ERR(priv)) {
-               dev_err(&pdev->dev, "%s: main driver probe failed\n", __func__);
-               return PTR_ERR(priv);
-       }
-       priv->dev->irq = pdev->irq;
-       priv->wol_irq = pdev->irq;
-
-       pci_set_drvdata(pdev, priv->dev);
+       memset(&res, 0, sizeof(res));
+       res.addr = pcim_iomap_table(pdev)[i];
+       res.wol_irq = pdev->irq;
+       res.irq = pdev->irq;
 
-       dev_dbg(&pdev->dev, "STMMAC PCI driver registration completed\n");
-
-       return 0;
+       return stmmac_dvr_probe(&pdev->dev, plat, &res);
 }
 
 /**