aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-06-27 08:53:42 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-29 01:11:48 -0400
commit1ca01512a2a95aa061c3fc24b7c5d7fad9f606bf (patch)
tree14750c0d7f55b822ff715f6aa040cad9c65ca74e /drivers/net/ethernet
parent3b233fe0435518169af03027aedc83d42eb28ac4 (diff)
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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/8390/ne2k-pci.c2
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c4
-rw-r--r--drivers/net/ethernet/intel/e100.c4
-rw-r--r--drivers/net/ethernet/myricom/myri10ge/myri10ge.c2
-rw-r--r--drivers/net/ethernet/realtek/8139cp.c2
-rw-r--r--drivers/net/ethernet/ti/tlan.c2
-rw-r--r--drivers/net/ethernet/via/via-velocity.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index 587a885de259..92201080e07a 100644
--- 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)
676 struct net_device *dev = pci_get_drvdata (pdev); 676 struct net_device *dev = pci_get_drvdata (pdev);
677 int rc; 677 int rc;
678 678
679 pci_set_power_state(pdev, 0); 679 pci_set_power_state(pdev, PCI_D0);
680 pci_restore_state(pdev); 680 pci_restore_state(pdev);
681 681
682 rc = pci_enable_device(pdev); 682 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 cd69ac79f565..2df48bb0f1ca 100644
--- 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)
4364 if (status) 4364 if (status)
4365 return status; 4365 return status;
4366 4366
4367 pci_set_power_state(pdev, 0); 4367 pci_set_power_state(pdev, PCI_D0);
4368 pci_restore_state(pdev); 4368 pci_restore_state(pdev);
4369 4369
4370 /* tell fw we're ready to fire cmds */ 4370 /* tell fw we're ready to fire cmds */
@@ -4460,7 +4460,7 @@ static pci_ers_result_t be_eeh_reset(struct pci_dev *pdev)
4460 return PCI_ERS_RESULT_DISCONNECT; 4460 return PCI_ERS_RESULT_DISCONNECT;
4461 4461
4462 pci_set_master(pdev); 4462 pci_set_master(pdev);
4463 pci_set_power_state(pdev, 0); 4463 pci_set_power_state(pdev, PCI_D0);
4464 pci_restore_state(pdev); 4464 pci_restore_state(pdev);
4465 4465
4466 /* Check if card is ok and fw is ready */ 4466 /* 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 d2bea3f07c73..5115ae76a5d1 100644
--- 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)
3069 pci_set_power_state(pdev, PCI_D0); 3069 pci_set_power_state(pdev, PCI_D0);
3070 pci_restore_state(pdev); 3070 pci_restore_state(pdev);
3071 /* ack any pending wake events, disable PME */ 3071 /* ack any pending wake events, disable PME */
3072 pci_enable_wake(pdev, 0, 0); 3072 pci_enable_wake(pdev, PCI_D0, 0);
3073 3073
3074 /* disable reverse auto-negotiation */ 3074 /* disable reverse auto-negotiation */
3075 if (nic->phy == phy_82552_v) { 3075 if (nic->phy == phy_82552_v) {
@@ -3160,7 +3160,7 @@ static void e100_io_resume(struct pci_dev *pdev)
3160 struct nic *nic = netdev_priv(netdev); 3160 struct nic *nic = netdev_priv(netdev);
3161 3161
3162 /* ack any pending wake events, disable PME */ 3162 /* ack any pending wake events, disable PME */
3163 pci_enable_wake(pdev, 0, 0); 3163 pci_enable_wake(pdev, PCI_D0, 0);
3164 3164
3165 netif_device_attach(netdev); 3165 netif_device_attach(netdev);
3166 if (netif_running(netdev)) { 3166 if (netif_running(netdev)) {
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 7be9788ed0f6..967bae8b85c5 100644
--- 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)
3299 if (mgp == NULL) 3299 if (mgp == NULL)
3300 return -EINVAL; 3300 return -EINVAL;
3301 netdev = mgp->dev; 3301 netdev = mgp->dev;
3302 pci_set_power_state(pdev, 0); /* zeros conf space as a side effect */ 3302 pci_set_power_state(pdev, PCI_D0); /* zeros conf space as a side effect */
3303 msleep(5); /* give card time to respond */ 3303 msleep(5); /* give card time to respond */
3304 pci_read_config_word(mgp->pdev, PCI_VENDOR_ID, &vendor); 3304 pci_read_config_word(mgp->pdev, PCI_VENDOR_ID, &vendor);
3305 if (vendor == 0xffff) { 3305 if (vendor == 0xffff) {
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 03523459c406..e6acb9fa5767 100644
--- 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,
1817/* Put the board into D3cold state and wait for WakeUp signal */ 1817/* Put the board into D3cold state and wait for WakeUp signal */
1818static void cp_set_d3_state (struct cp_private *cp) 1818static void cp_set_d3_state (struct cp_private *cp)
1819{ 1819{
1820 pci_enable_wake (cp->pdev, 0, 1); /* Enable PME# generation */ 1820 pci_enable_wake(cp->pdev, PCI_D0, 1); /* Enable PME# generation */
1821 pci_set_power_state (cp->pdev, PCI_D3hot); 1821 pci_set_power_state (cp->pdev, PCI_D3hot);
1822} 1822}
1823 1823
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 59abfbcd0d55..591437e59b90 100644
--- 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)
372 372
373 pci_set_power_state(pdev, PCI_D0); 373 pci_set_power_state(pdev, PCI_D0);
374 pci_restore_state(pdev); 374 pci_restore_state(pdev);
375 pci_enable_wake(pdev, 0, 0); 375 pci_enable_wake(pdev, PCI_D0, 0);
376 netif_device_attach(dev); 376 netif_device_attach(dev);
377 377
378 if (netif_running(dev)) 378 if (netif_running(dev))
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 76919948b4ee..1d6dc41f755d 100644
--- 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)
3211 velocity_set_power_state(vptr, PCI_D0); 3211 velocity_set_power_state(vptr, PCI_D0);
3212 3212
3213 if (vptr->pdev) { 3213 if (vptr->pdev) {
3214 pci_enable_wake(vptr->pdev, 0, 0); 3214 pci_enable_wake(vptr->pdev, PCI_D0, 0);
3215 pci_restore_state(vptr->pdev); 3215 pci_restore_state(vptr->pdev);
3216 } 3216 }
3217 3217