diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2014-01-05 03:24:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-04 19:27:58 -0500 |
| commit | 77051ed829bc1e8b4a99a4a27520faa5bab0976a (patch) | |
| tree | 0d237b1415a9e2e3ea721fd2634a565663f94d97 /drivers/net/phy/phy.c | |
| parent | 553fe92b26e15200a4df9c618175c79e49b6cc55 (diff) | |
phy: kill excess empty lines
Remove excess empty lines such as those between a function call and its result
check and just duplicate ones between functions.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 43c51734d6cb..4e6dcc1cc237 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -384,7 +384,6 @@ int phy_start_aneg(struct phy_device *phydev) phy_sanitize_settings(phydev); err = phydev->drv->config_aneg(phydev); - if (err < 0) goto out_unlock; @@ -404,7 +403,6 @@ out_unlock: } EXPORT_SYMBOL(phy_start_aneg); - /** * phy_start_machine - start PHY state machine tracking * @phydev: the phy_device struct @@ -514,13 +512,11 @@ static int phy_disable_interrupts(struct phy_device *phydev) /* Disable PHY interrupts */ err = phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED); - if (err) goto phy_err; /* Clear the interrupt */ err = phy_clear_interrupt(phydev); - if (err) goto phy_err; @@ -589,7 +585,6 @@ int phy_stop_interrupts(struct phy_device *phydev) } EXPORT_SYMBOL(phy_stop_interrupts); - /** * phy_change - Scheduled by the phy_interrupt/timer to handle PHY changes * @work: work_struct that describes the work to be done @@ -622,7 +617,6 @@ void phy_change(struct work_struct *work) /* reschedule state queue work to run as soon as possible */ cancel_delayed_work_sync(&phydev->state_queue); queue_delayed_work(system_power_efficient_wq, &phydev->state_queue, 0); - return; ignore: @@ -668,7 +662,6 @@ out_unlock: } EXPORT_SYMBOL(phy_stop); - /** * phy_start - start or restart a PHY device * @phydev: target phy_device struct @@ -730,7 +723,6 @@ void phy_state_machine(struct work_struct *work) break; case PHY_AN: err = phy_read_status(phydev); - if (err < 0) break; @@ -762,7 +754,6 @@ void phy_state_machine(struct work_struct *work) break; case PHY_NOLINK: err = phy_read_status(phydev); - if (err) break; @@ -774,7 +765,6 @@ void phy_state_machine(struct work_struct *work) break; case PHY_FORCING: err = genphy_update_link(phydev); - if (err) break; @@ -797,7 +787,6 @@ void phy_state_machine(struct work_struct *work) break; case PHY_CHANGELINK: err = phy_read_status(phydev); - if (err) break; @@ -824,14 +813,11 @@ void phy_state_machine(struct work_struct *work) } break; case PHY_RESUMING: - err = phy_clear_interrupt(phydev); - if (err) break; err = phy_config_interrupt(phydev, PHY_INTERRUPT_ENABLED); - if (err) break; |