tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] sky2: set_power_state should be void

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>

authored by

Stephen Hemminger and committed by
Linus Torvalds 2ccc99b7 5e625b08

+8 -8
+8 -8
drivers/net/sky2.c
··· 187 187 return v; 188 188 } 189 189 190 - static int sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) 190 + static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) 191 191 { 192 192 u16 power_control; 193 193 u32 reg1; 194 194 int vaux; 195 - int ret = 0; 196 195 197 196 pr_debug("sky2_set_power_state %d\n", state); 198 197 sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); ··· 274 275 break; 275 276 default: 276 277 printk(KERN_ERR PFX "Unknown power state %d\n", state); 277 - ret = -1; 278 278 } 279 279 280 280 sky2_pci_write16(hw, hw->pm_cap + PCI_PM_CTRL, power_control); 281 281 sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); 282 - return ret; 283 282 } 284 283 285 284 static void sky2_phy_reset(struct sky2_hw *hw, unsigned port) ··· 3425 3428 { 3426 3429 struct sky2_hw *hw = pci_get_drvdata(pdev); 3427 3430 int i; 3431 + pci_power_t pstate = pci_choose_state(pdev, state); 3432 + 3433 + if (!(pstate == PCI_D3hot || pstate == PCI_D3cold)) 3434 + return -EINVAL; 3428 3435 3429 3436 for (i = 0; i < 2; i++) { 3430 3437 struct net_device *dev = hw->dev[i]; ··· 3443 3442 } 3444 3443 3445 3444 pci_save_state(pdev); 3446 - return sky2_set_power_state(hw, pci_choose_state(pdev, state)); 3445 + sky2_set_power_state(hw, pstate); 3446 + return 0; 3447 3447 } 3448 3448 3449 3449 static int sky2_resume(struct pci_dev *pdev) ··· 3454 3452 3455 3453 pci_restore_state(pdev); 3456 3454 pci_enable_wake(pdev, PCI_D0, 0); 3457 - err = sky2_set_power_state(hw, PCI_D0); 3458 - if (err) 3459 - goto out; 3455 + sky2_set_power_state(hw, PCI_D0); 3460 3456 3461 3457 err = sky2_reset(hw); 3462 3458 if (err)