net: sfp: move fwnode parsing into sfp-bus layer
Subsystems (4)
PATCH 1/1 net: sfp: move fwnode parsing into sfp-bus layer
Rather than parsing the sfp firmware node in phylink, parse it in the sfp-bus code, so we can re-use this code for PHYs without having to duplicate the parsing.
Signed-off-by Russell King <[email protected]>
--- drivers/net/phy/phylink.c | 21 ++++--------- drivers/net/phy/sfp-bus.c | 65 +++++++++++++++++++++++++-------------- include/linux/sfp.h | 10 +++--- 3 files changed, 53 insertions(+), 43 deletions(-)
drivers/net/phy/phylink.c +6 -15
@@ -548,26 +548,17 @@ static const struct sfp_upstream_ops sfp_phylink_ops;static int phylink_register_sfp (struct phylink *pl,struct fwnode_handle *fwnode) { -struct fwnode_reference_args ref; +struct sfp_bus *bus;int ret; -if (!fwnode) -return 0 ; - - ret =fwnode_property_get_reference_args (fwnode,"sfp" ,NULL , -0 ,0 , &ref); -if (ret <0 ) { -if (ret == -ENOENT ) -return 0 ; - -phylink_err (pl,"unable to parse \"sfp\" node: %d\n" , - ret); + bus =sfp_register_upstream_node (fwnode, pl, &sfp_phylink_ops); +if (IS_ERR (bus)) { + ret =PTR_ERR (bus); +phylink_err (pl,"unable to attach SFP bus: %d\n" , ret);return ret; } - pl->sfp_bus =sfp_register_upstream (ref.fwnode, pl, &sfp_phylink_ops); -if (!pl->sfp_bus) -return -ENOMEM ; + pl->sfp_bus = bus;return 0 ; }
drivers/net/phy/sfp-bus.c +42 -23
93 lines not on this page · raw message
include/linux/sfp.h +5 -5
@@ -508,9 +508,9 @@ int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee, u8 *data);void sfp_upstream_start (struct sfp_bus *bus);void sfp_upstream_stop (struct sfp_bus *bus); -struct sfp_bus *sfp_register_upstream (struct fwnode_handle *fwnode, -void *upstream, -const struct sfp_upstream_ops *ops); +struct sfp_bus *sfp_register_upstream_node (struct fwnode_handle *fwnode, +void *upstream, +const struct sfp_upstream_ops *ops);void sfp_unregister_upstream (struct sfp_bus *bus);#else static inline int sfp_parse_port(struct sfp_bus *bus,
@@ -553,11 +553,11 @@ static inline void sfp_upstream_stop(struct sfp_bus *bus) { } -static inline struct sfp_bus *sfp_register_upstream ( +static inline struct sfp_bus *sfp_register_upstream_node (struct fwnode_handle *fwnode,void *upstream,const struct sfp_upstream_ops *ops) { -return (struct sfp_bus *)-1 ; +return NULL ; }static inline void sfp_unregister_upstream (struct sfp_bus *bus)
Signature · 1 line
2.20.1
David Miller
AppliedFrom: Russell King <[email protected]>
Date: Tue, 15 Oct 2019 11:38:39 +0100
Quoted 5 lines
Rather than parsing the sfp firmware node in phylink, parse it in the sfp-bus code, so we can re-use this code for PHYs without having to duplicate the parsing.
Signed-off-by Russell King <[email protected]>
Applied, thank you.