mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

[PATCH] sky2: set_power_state should be void

Browse source 
The set power state function is cleaner if it doesn't return anything.
The only caller that could fail is in suspend() and it can check the argument
there.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Stephen Hemminger 2006-06-13 17:17:27 +09:00 committed by Linus Torvalds
parent 5e625b0844
commit 2ccc99b7b7
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/sky2.c
View file

@ -187,12 +187,11 @@ static u16 gm_phy_read(struct sky2_hw *hw, unsigned port, u16 reg)
return v; return v;
} }
static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
{ {
u16 power_control; u16 power_control;
u32 reg1; u32 reg1;
int vaux; int vaux;
int ret = 0;
pr_debug("sky2_set_power_state %d\n", state); pr_debug("sky2_set_power_state %d\n", state);
sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
@ -275,12 +274,10 @@ static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state)
break; break;
default: default:
printk(KERN_ERR PFX "Unknown power state %d\n", state); printk(KERN_ERR PFX "Unknown power state %d\n", state);
ret = -1;
} }
sky2_pci_write16(hw, hw->pm_cap + PCI_PM_CTRL, power_control); sky2_pci_write16(hw, hw->pm_cap + PCI_PM_CTRL, power_control);
sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
return ret;
} }
static void sky2_phy_reset(struct sky2_hw *hw, unsigned port) static void sky2_phy_reset(struct sky2_hw *hw, unsigned port)
@ -3428,6 +3425,10 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
struct sky2_hw *hw = pci_get_drvdata(pdev); struct sky2_hw *hw = pci_get_drvdata(pdev);
int i; int i;
pci_power_t pstate = pci_choose_state(pdev, state);
if (!(pstate == PCI_D3hot || pstate == PCI_D3cold))
return -EINVAL;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
struct net_device *dev = hw->dev[i]; struct net_device *dev = hw->dev[i];
@ -3442,7 +3443,8 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
} }
pci_save_state(pdev); pci_save_state(pdev);
return sky2_set_power_state(hw, pci_choose_state(pdev, state)); sky2_set_power_state(hw, pstate);
return 0;
} }
static int sky2_resume(struct pci_dev *pdev) static int sky2_resume(struct pci_dev *pdev)
@ -3452,9 +3454,7 @@ static int sky2_resume(struct pci_dev *pdev)
pci_restore_state(pdev); pci_restore_state(pdev);
pci_enable_wake(pdev, PCI_D0, 0); pci_enable_wake(pdev, PCI_D0, 0);
err = sky2_set_power_state(hw, PCI_D0); sky2_set_power_state(hw, PCI_D0);
if (err)
goto out;
err = sky2_reset(hw); err = sky2_reset(hw);
if (err) if (err)