jme: Cleanup PM operations after using new PM API

[jme.git] / jme.c

diff --git a/jme.c b/jme.c
index b5b174a8c149be9f07e56d8b9f07524ea3505792..6b2a5e744255241a572e66b6b8b1298d430894d1 100644 (file)
--- a/jme.c
+++ b/jme.c
@@ -271,9 +271,7 @@ jme_reset_mac_processor(struct jme_adapter *jme)
 static inline void
 jme_clear_pm(struct jme_adapter *jme)
 {
 static inline void
 jme_clear_pm(struct jme_adapter *jme)
 {

-       jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs);
-       pci_set_power_state(jme->pdev, PCI_D0);
-       device_set_wakeup_enable(&jme->pdev->dev, false);
+       jwrite32(jme, JME_PMCS, PMCS_STMASK | jme->reg_pmcs);

 }
 
 static int
 }
 
 static int


@@ -1817,11 +1815,9 @@ jme_powersave_phy(struct jme_adapter *jme)
 {
        if (jme->reg_pmcs) {
                jme_set_100m_half(jme);
 {
        if (jme->reg_pmcs) {
                jme_set_100m_half(jme);

-

                if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))
                        jme_wait_link(jme);
                if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))
                        jme_wait_link(jme);

-
-               jwrite32(jme, JME_PMCS, jme->reg_pmcs);
+               jme_clear_pm(jme);

        } else {
                jme_phy_off(jme);
        }
        } else {
                jme_phy_off(jme);
        }


@@ -2529,8 +2525,7 @@ jme_set_wol(struct net_device *netdev,
                jme->reg_pmcs |= PMCS_MFEN;
 
        jwrite32(jme, JME_PMCS, jme->reg_pmcs);
                jme->reg_pmcs |= PMCS_MFEN;
 
        jwrite32(jme, JME_PMCS, jme->reg_pmcs);

-
-       device_set_wakeup_enable(&jme->pdev->dev, jme->reg_pmcs);
+       device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));

 
        return 0;
 }
 
        return 0;
 }


@@ -3058,6 +3053,9 @@ jme_init_one(struct pci_dev *pdev,
        jme->mii_if.mdio_write = jme_mdio_write;
 
        jme_clear_pm(jme);
        jme->mii_if.mdio_write = jme_mdio_write;
 
        jme_clear_pm(jme);

+       pci_set_power_state(jme->pdev, PCI_D0);
+       device_set_wakeup_enable(&pdev->dev, true);
+

        jme_set_phyfifo_5level(jme);
        jme->pcirev = pdev->revision;
        if (!jme->fpgaver)
        jme_set_phyfifo_5level(jme);
        jme->pcirev = pdev->revision;
        if (!jme->fpgaver)


@@ -3135,8 +3133,9 @@ jme_shutdown(struct pci_dev *pdev)
        pci_pme_active(pdev, true);
 }
 
        pci_pme_active(pdev, true);
 }
 

-#ifdef CONFIG_PM
-static int jme_suspend(struct device *dev)
+#ifdef CONFIG_PM_SLEEP
+static int
+jme_suspend(struct device *dev)

 {
        struct pci_dev *pdev = to_pci_dev(dev);
        struct net_device *netdev = pci_get_drvdata(pdev);
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        struct net_device *netdev = pci_get_drvdata(pdev);


@@ -3175,14 +3174,14 @@ static int jme_suspend(struct device *dev)
        return 0;
 }
 
        return 0;
 }
 

-static int jme_resume(struct device *dev)
+static int
+jme_resume(struct device *dev)

 {
        struct pci_dev *pdev = to_pci_dev(dev);
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct jme_adapter *jme = netdev_priv(netdev);
 
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct jme_adapter *jme = netdev_priv(netdev);
 

-       jwrite32(jme, JME_PMCS, 0xFFFF0000 | jme->reg_pmcs);
-
+       jme_clear_pm(jme);

        jme_phy_on(jme);
        if (test_bit(JME_FLAG_SSET, &jme->flags))
                jme_set_settings(netdev, &jme->old_ecmd);
        jme_phy_on(jme);
        if (test_bit(JME_FLAG_SSET, &jme->flags))
                jme_set_settings(netdev, &jme->old_ecmd);