e1000 driver update
Signed-off-by: Jeff Kirsher <[EMAIL PROTECTED]>
Signed-off-by: John Ronciak <[EMAIL PROTECTED]>
Signed-off-by: Jesse Brandeburg <[EMAIL PROTECTED]>
5. Fix compilation warnings
- Handle return values from functions
diff -up linux-2.6/drivers/net/e1000/e1000_main.c
linux-2.6.new/drivers/net/e1000/e1000_main.c
--- linux-2.6/drivers/net/e1000/e1000_main.c 2005-11-14 16:20:34.000000000
-0800
+++ linux-2.6.new/drivers/net/e1000/e1000_main.c 2005-11-04
01:23:40.000000000 -0800
@@ -4374,6 +4374,7 @@ e1000_set_spd_dplx(struct e1000_adapter
struct e1000_adapter *adapter = netdev_priv(netdev);
uint32_t ctrl, ctrl_ext, rctl, manc, status, swsm;
uint32_t wufc = adapter->wol;
+ int retval;
netif_device_detach(netdev);
@@ -4419,13 +4419,21 @@ e1000_suspend(struct pci_dev *pdev, pm_m
E1000_WRITE_REG(&adapter->hw, WUC, E1000_WUC_PME_EN);
E1000_WRITE_REG(&adapter->hw, WUFC, wufc);
- pci_enable_wake(pdev, 3, 1);
- pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ retval = pci_enable_wake(pdev, 3, 1);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 wake\n");
+ retval = pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 cold
wake\n");
} else {
E1000_WRITE_REG(&adapter->hw, WUC, 0);
E1000_WRITE_REG(&adapter->hw, WUFC, 0);
- pci_enable_wake(pdev, 3, 0);
- pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+ retval = pci_enable_wake(pdev, 3, 0);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 wake\n");
+ retval = pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 cold
wake\n");
}
pci_save_state(pdev);
@@ -4436,8 +4445,12 @@ e1000_suspend(struct pci_dev *pdev, pm_m
if(manc & E1000_MANC_SMBUS_EN) {
manc |= E1000_MANC_ARP_EN;
E1000_WRITE_REG(&adapter->hw, MANC, manc);
- pci_enable_wake(pdev, 3, 1);
- pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ retval = pci_enable_wake(pdev, 3, 1);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3
wake\n");
+ retval = pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3
cold wake\n");
}
}
@@ -4463,7 +4409,10 @@ e1000_suspend(struct pci_dev *pdev, pm_m
}
pci_disable_device(pdev);
- pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+ retval = pci_set_power_state(pdev, pci_choose_state(pdev, state));
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error in setting power state\n");
return 0;
}
@@ -4473,16 +4409,23 @@
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
+ int retval;
uint32_t manc, ret_val, swsm;
uint32_t ctrl_ext;
- pci_set_power_state(pdev, PCI_D0);
+ retval = pci_set_power_state(pdev, PCI_D0);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error in setting power state\n");
pci_restore_state(pdev);
ret_val = pci_enable_device(pdev);
pci_set_master(pdev);
- pci_enable_wake(pdev, PCI_D3hot, 0);
- pci_enable_wake(pdev, PCI_D3cold, 0);
+ retval = pci_enable_wake(pdev, PCI_D3hot, 0);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 wake\n");
+ retval = pci_enable_wake(pdev, PCI_D3cold, 0); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 cold wake\n");
e1000_reset(adapter);
E1000_WRITE_REG(&adapter->hw, WUS, ~0);
Cheers,
Jeffdiff -up linux-2.6/drivers/net/e1000/e1000_main.c
linux-2.6.new/drivers/net/e1000/e1000_main.c
--- linux-2.6/drivers/net/e1000/e1000_main.c 2005-11-14 16:20:34.000000000
-0800
+++ linux-2.6.new/drivers/net/e1000/e1000_main.c 2005-11-04
01:23:40.000000000 -0800
@@ -4374,6 +4374,7 @@ e1000_set_spd_dplx(struct e1000_adapter
struct e1000_adapter *adapter = netdev_priv(netdev);
uint32_t ctrl, ctrl_ext, rctl, manc, status, swsm;
uint32_t wufc = adapter->wol;
+ int retval;
netif_device_detach(netdev);
@@ -4419,13 +4419,21 @@ e1000_suspend(struct pci_dev *pdev, pm_m
E1000_WRITE_REG(&adapter->hw, WUC, E1000_WUC_PME_EN);
E1000_WRITE_REG(&adapter->hw, WUFC, wufc);
- pci_enable_wake(pdev, 3, 1);
- pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ retval = pci_enable_wake(pdev, 3, 1);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 wake\n");
+ retval = pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 cold
wake\n");
} else {
E1000_WRITE_REG(&adapter->hw, WUC, 0);
E1000_WRITE_REG(&adapter->hw, WUFC, 0);
- pci_enable_wake(pdev, 3, 0);
- pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+ retval = pci_enable_wake(pdev, 3, 0);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 wake\n");
+ retval = pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 cold
wake\n");
}
pci_save_state(pdev);
@@ -4436,8 +4445,12 @@ e1000_suspend(struct pci_dev *pdev, pm_m
if(manc & E1000_MANC_SMBUS_EN) {
manc |= E1000_MANC_ARP_EN;
E1000_WRITE_REG(&adapter->hw, MANC, manc);
- pci_enable_wake(pdev, 3, 1);
- pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ retval = pci_enable_wake(pdev, 3, 1);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3
wake\n");
+ retval = pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3
cold wake\n");
}
}
@@ -4463,7 +4409,10 @@ e1000_suspend(struct pci_dev *pdev, pm_m
}
pci_disable_device(pdev);
- pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+ retval = pci_set_power_state(pdev, pci_choose_state(pdev, state));
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error in setting power state\n");
return 0;
}
@@ -4473,16 +4409,23 @@
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct e1000_adapter *adapter = netdev_priv(netdev);
+ int retval;
uint32_t manc, ret_val, swsm;
uint32_t ctrl_ext;
- pci_set_power_state(pdev, PCI_D0);
+ retval = pci_set_power_state(pdev, PCI_D0);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error in setting power state\n");
pci_restore_state(pdev);
ret_val = pci_enable_device(pdev);
pci_set_master(pdev);
- pci_enable_wake(pdev, PCI_D3hot, 0);
- pci_enable_wake(pdev, PCI_D3cold, 0);
+ retval = pci_enable_wake(pdev, PCI_D3hot, 0);
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 wake\n");
+ retval = pci_enable_wake(pdev, PCI_D3cold, 0); /* 4 == D3 cold */
+ if (retval)
+ DPRINTK(PROBE, ERR, "Error setting enable D3 cold wake\n");
e1000_reset(adapter);
E1000_WRITE_REG(&adapter->hw, WUS, ~0);
