net/trivial: replace numeric with standard PM state macros

Use standard PM state macros PCI_Dx instead of numeric 0/1/2..

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 587a885de259064cb2c07d25a5b12a1d8b9c08bf..92201080e07a104b4e25d2f308a7b62d8f0099ba 100644 (file)
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -676,7 +676,7 @@ static int ne2k_pci_resume (struct pci_dev *pdev)
        struct net_device *dev = pci_get_drvdata (pdev);
        int rc;
 
-       pci_set_power_state(pdev, 0);
+       pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
 
        rc = pci_enable_device(pdev);

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index cd69ac79f565bb4490c55507d0696d24ba84c106..2df48bb0f1cab26350d30add2b5076761c30ecef 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -4364,7 +4364,7 @@ static int be_resume(struct pci_dev *pdev)
        if (status)
                return status;
 
-       pci_set_power_state(pdev, 0);
+       pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
 
        /* tell fw we're ready to fire cmds */
@@ -4460,7 +4460,7 @@ static pci_ers_result_t be_eeh_reset(struct pci_dev *pdev)
                return PCI_ERS_RESULT_DISCONNECT;
 
        pci_set_master(pdev);
-       pci_set_power_state(pdev, 0);
+       pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
 
        /* Check if card is ok and fw is ready */

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index d2bea3f07c73782504dffef8862d5a77944c7290..5115ae76a5d1c02f0788138e68fac4acdb551767 100644 (file)
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -3069,7 +3069,7 @@ static int e100_resume(struct pci_dev *pdev)
        pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
        /* ack any pending wake events, disable PME */
-       pci_enable_wake(pdev, 0, 0);
+       pci_enable_wake(pdev, PCI_D0, 0);
 
        /* disable reverse auto-negotiation */
        if (nic->phy == phy_82552_v) {
@@ -3160,7 +3160,7 @@ static void e100_io_resume(struct pci_dev *pdev)
        struct nic *nic = netdev_priv(netdev);
 
        /* ack any pending wake events, disable PME */
-       pci_enable_wake(pdev, 0, 0);
+       pci_enable_wake(pdev, PCI_D0, 0);
 
        netif_device_attach(netdev);
        if (netif_running(netdev)) {

diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 7be9788ed0f6fddcb43abd1b384b0424ad33cb22..967bae8b85c5f6c9bb0a720d97b3c0c17c940430 100644 (file)
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -3299,7 +3299,7 @@ static int myri10ge_resume(struct pci_dev *pdev)
        if (mgp == NULL)
                return -EINVAL;
        netdev = mgp->dev;
-       pci_set_power_state(pdev, 0);   /* zeros conf space as a side effect */
+       pci_set_power_state(pdev, PCI_D0);      /* zeros conf space as a side effect */
        msleep(5);              /* give card time to respond */
        pci_read_config_word(mgp->pdev, PCI_VENDOR_ID, &vendor);
        if (vendor == 0xffff) {

diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 03523459c4061627d1fad51f751082298eec2147..e6acb9fa5767687d8565596adc11328f55e2a12b 100644 (file)
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -1817,7 +1817,7 @@ static int cp_set_eeprom(struct net_device *dev,
 /* Put the board into D3cold state and wait for WakeUp signal */
 static void cp_set_d3_state (struct cp_private *cp)
 {
-       pci_enable_wake (cp->pdev, 0, 1); /* Enable PME# generation */
+       pci_enable_wake(cp->pdev, PCI_D0, 1); /* Enable PME# generation */
        pci_set_power_state (cp->pdev, PCI_D3hot);
 }
 

diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 59abfbcd0d551e02cb25fae12216720a154f4bda..591437e59b9019c9fa0597a8342f63ae5357fcaa 100644 (file)
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -372,7 +372,7 @@ static int tlan_resume(struct pci_dev *pdev)
 
        pci_set_power_state(pdev, PCI_D0);
        pci_restore_state(pdev);
-       pci_enable_wake(pdev, 0, 0);
+       pci_enable_wake(pdev, PCI_D0, 0);
        netif_device_attach(dev);
 
        if (netif_running(dev))

diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 76919948b4ee32bd4e79a9ddce25e962e6437add..1d6dc41f755dba00edfbc83d07c1d898c05020cf 100644 (file)
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -3211,7 +3211,7 @@ static int velocity_resume(struct device *dev)
        velocity_set_power_state(vptr, PCI_D0);
 
        if (vptr->pdev) {
-               pci_enable_wake(vptr->pdev, 0, 0);
+               pci_enable_wake(vptr->pdev, PCI_D0, 0);
                pci_restore_state(vptr->pdev);
        }
 

diff --git a/drivers/net/wireless/orinoco/orinoco_pci.h b/drivers/net/wireless/orinoco/orinoco_pci.h
index ea7231af40a848be49f36f3e78a33b1a2c98ff14..43f5b9f5a0b0a5078a1d36c723de318bb62725c9 100644 (file)
--- a/drivers/net/wireless/orinoco/orinoco_pci.h
+++ b/drivers/net/wireless/orinoco/orinoco_pci.h
@@ -38,7 +38,7 @@ static int orinoco_pci_resume(struct pci_dev *pdev)
        struct net_device *dev = priv->ndev;
        int err;
 
-       pci_set_power_state(pdev, 0);
+       pci_set_power_state(pdev, PCI_D0);
        err = pci_enable_device(pdev);
        if (err) {
                printk(KERN_ERR "%s: pci_enable_device failed on resume\n",