diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2014-01-04 19:27:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-04 19:27:58 -0500 |
commit | 29935aebc7a8f2d3f9cc1743f24f0db8b4610ece (patch) | |
tree | e42888d112b50d10849fbfdfb91434c165d1d322 /include/linux/phy.h | |
parent | 77051ed829bc1e8b4a99a4a27520faa5bab0976a (diff) |
phylib: remove unused adjust_state() callback
Remove adjust_state() callback from 'struct phy_device' since it seems to have
never been really used from the inception: phy_start_machine() has been always
called with 2nd argument equal to NULL.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/phy.h')
-rw-r--r-- | include/linux/phy.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index d4cb756a41c5..cf1bb480cfb1 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
@@ -282,8 +282,6 @@ struct phy_c45_device_ids { | |||
282 | * attached_dev: The attached enet driver's device instance ptr | 282 | * attached_dev: The attached enet driver's device instance ptr |
283 | * adjust_link: Callback for the enet controller to respond to | 283 | * adjust_link: Callback for the enet controller to respond to |
284 | * changes in the link state. | 284 | * changes in the link state. |
285 | * adjust_state: Callback for the enet driver to respond to | ||
286 | * changes in the state machine. | ||
287 | * | 285 | * |
288 | * speed, duplex, pause, supported, advertising, lp_advertising, | 286 | * speed, duplex, pause, supported, advertising, lp_advertising, |
289 | * and autoneg are used like in mii_if_info | 287 | * and autoneg are used like in mii_if_info |
@@ -364,8 +362,6 @@ struct phy_device { | |||
364 | struct net_device *attached_dev; | 362 | struct net_device *attached_dev; |
365 | 363 | ||
366 | void (*adjust_link)(struct net_device *dev); | 364 | void (*adjust_link)(struct net_device *dev); |
367 | |||
368 | void (*adjust_state)(struct net_device *dev); | ||
369 | }; | 365 | }; |
370 | #define to_phy_device(d) container_of(d, struct phy_device, dev) | 366 | #define to_phy_device(d) container_of(d, struct phy_device, dev) |
371 | 367 | ||
@@ -585,8 +581,7 @@ int phy_drivers_register(struct phy_driver *new_driver, int n); | |||
585 | void phy_state_machine(struct work_struct *work); | 581 | void phy_state_machine(struct work_struct *work); |
586 | void phy_change(struct work_struct *work); | 582 | void phy_change(struct work_struct *work); |
587 | void phy_mac_interrupt(struct phy_device *phydev, int new_link); | 583 | void phy_mac_interrupt(struct phy_device *phydev, int new_link); |
588 | void phy_start_machine(struct phy_device *phydev, | 584 | void phy_start_machine(struct phy_device *phydev); |
589 | void (*handler)(struct net_device *)); | ||
590 | void phy_stop_machine(struct phy_device *phydev); | 585 | void phy_stop_machine(struct phy_device *phydev); |
591 | int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); | 586 | int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); |
592 | int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); | 587 | int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); |