Commitff198cd

maciejsszmigiero

authored and

davem330

committed

net: phy: leds: Refactor "no link" handler into a separate function

Currently, phy_led_trigger_change_speed() is handling a "no link" conditionlike it was some kind of an error (using "goto" to a code at the functionend).However, having no link at PHY is an ordinary operational state, so let'shandle it in an appropriately named separate function so it is more obviouswhat the code is doing.Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>Signed-off-by: David S. Miller <davem@davemloft.net>

1 parentfffcefe commitff198cdCopy full SHA for ff198cd

File tree

1 file changed

+10

-10

lines changed

drivers/net/phy
- phy_led_triggers.c

1 file changed

+10

-10

lines changed

`‎drivers/net/phy/phy_led_triggers.c‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,20 @@ static struct phy_led_trigger phy_speed_to_led_trigger(struct phy_device phy,`
`27`	`27`	`returnNULL;`
`28`	`28`	`}`
`29`	`29`
	`30`	`+staticvoidphy_led_trigger_no_link(structphy_device*phy)`
	`31`	`+{`
	`32`	`+if (phy->last_triggered) {`
	`33`	`+led_trigger_event(&phy->last_triggered->trigger,LED_OFF);`
	`34`	`+phy->last_triggered=NULL;`
	`35`	`+}`
	`36`	`+}`
	`37`	`+`
`30`	`38`	`voidphy_led_trigger_change_speed(structphy_device*phy)`
`31`	`39`	`{`
`32`	`40`	`structphy_led_trigger*plt;`
`33`	`41`
`34`	`42`	`if (!phy->link)`
`35`		`-gotoout_change_speed;`
	`43`	`+returnphy_led_trigger_no_link(phy);`
`36`	`44`
`37`	`45`	`if (phy->speed==0)`
`38`	`46`	`return;`
`@@ -42,22 +50,14 @@ void phy_led_trigger_change_speed(struct phy_device *phy)`
`42`	`50`	`netdev_alert(phy->attached_dev,`
`43`	`51`	`"No phy led trigger registered for speed(%d)\n",`
`44`	`52`	`phy->speed);`
`45`		`-gotoout_change_speed;`
	`53`	`+returnphy_led_trigger_no_link(phy);`
`46`	`54`	`}`
`47`	`55`
`48`	`56`	`if (plt!=phy->last_triggered) {`
`49`	`57`	`led_trigger_event(&phy->last_triggered->trigger,LED_OFF);`
`50`	`58`	`led_trigger_event(&plt->trigger,LED_FULL);`
`51`	`59`	`phy->last_triggered=plt;`
`52`	`60`	`}`
`53`		`-return;`
`54`		`-`
`55`		`-out_change_speed:`
`56`		`-if (phy->last_triggered) {`
`57`		`-led_trigger_event(&phy->last_triggered->trigger,`
`58`		`-LED_OFF);`
`59`		`-phy->last_triggered=NULL;`
`60`		`-}`
`61`	`61`	`}`
`62`	`62`	`EXPORT_SYMBOL_GPL(phy_led_trigger_change_speed);`
`63`	`63`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitff198cd

File tree

1 file changed

1 file changed

`‎drivers/net/phy/phy_led_triggers.c‎`

0 commit comments