Commit 9ce13873 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: sfp: remove old sfp_parse_* functions 



Remove the old sfp_parse_*() functions that are now no longer used.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uydVz-000000061Wj-13Yd@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4b627655

drivers/net/phy/sfp-bus.c

+0 −54
Original line number Diff line number Diff line
@@ -39,27 +39,6 @@ const struct sfp_module_caps *sfp_get_module_caps(struct sfp_bus *bus) 
}

EXPORT_SYMBOL_GPL(sfp_get_module_caps);



/**

 * sfp_parse_port() - Parse the EEPROM base ID, setting the port type

 * @bus: a pointer to the &struct sfp_bus structure for the sfp module

 * @id: a pointer to the module's &struct sfp_eeprom_id

 * @support: optional pointer to an array of unsigned long for the

 *   ethtool support mask

 *

 * Parse the EEPROM identification given in @id, and return one of

 * %PORT_TP, %PORT_FIBRE or %PORT_OTHER. If @support is non-%NULL,

 * also set the ethtool %ETHTOOL_LINK_MODE_xxx_BIT corresponding with

 * the connector type.

 *

 * If the port type is not known, returns %PORT_OTHER.

 */

int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id,

		   unsigned long *support)

{

	return bus->caps.port;

}

EXPORT_SYMBOL_GPL(sfp_parse_port);



static void sfp_module_parse_port(struct sfp_bus *bus,

				  const struct sfp_eeprom_id *id)

{
@@ -118,20 +97,6 @@ static void sfp_module_parse_port(struct sfp_bus *bus, 
	bus->caps.port = port;

}



/**

 * sfp_may_have_phy() - indicate whether the module may have a PHY

 * @bus: a pointer to the &struct sfp_bus structure for the sfp module

 * @id: a pointer to the module's &struct sfp_eeprom_id

 *

 * Parse the EEPROM identification given in @id, and return whether

 * this module may have a PHY.

 */

bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id)

{

	return bus->caps.may_have_phy;

}

EXPORT_SYMBOL_GPL(sfp_may_have_phy);



static void sfp_module_parse_may_have_phy(struct sfp_bus *bus,

					  const struct sfp_eeprom_id *id)

{
@@ -154,25 +119,6 @@ static void sfp_module_parse_may_have_phy(struct sfp_bus *bus, 
	bus->caps.may_have_phy = false;

}



/**

 * sfp_parse_support() - Parse the eeprom id for supported link modes

 * @bus: a pointer to the &struct sfp_bus structure for the sfp module

 * @id: a pointer to the module's &struct sfp_eeprom_id

 * @support: pointer to an array of unsigned long for the ethtool support mask

 * @interfaces: pointer to an array of unsigned long for phy interface modes

 *		mask

 *

 * Parse the EEPROM identification information and derive the supported

 * ethtool link modes for the module.

 */

void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,

		       unsigned long *support, unsigned long *interfaces)

{

	linkmode_or(support, support, bus->caps.link_modes);

	phy_interface_copy(interfaces, bus->caps.interfaces);

}

EXPORT_SYMBOL_GPL(sfp_parse_support);



static void sfp_module_parse_support(struct sfp_bus *bus,

				     const struct sfp_eeprom_id *id)

{

include/linux/sfp.h

+0 −25
Original line number Diff line number Diff line
@@ -577,11 +577,6 @@ struct sfp_upstream_ops { 


#if IS_ENABLED(CONFIG_SFP)

const struct sfp_module_caps *sfp_get_module_caps(struct sfp_bus *bus);

int sfp_parse_port(struct sfp_bus *bus, const struct sfp_eeprom_id *id,

		   unsigned long *support);

bool sfp_may_have_phy(struct sfp_bus *bus, const struct sfp_eeprom_id *id);

void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,

		       unsigned long *support, unsigned long *interfaces);

phy_interface_t sfp_select_interface(struct sfp_bus *bus,

				     const unsigned long *link_modes);
@@ -607,26 +602,6 @@ sfp_get_module_caps(struct sfp_bus *bus) 
	return NULL;

}



static inline int sfp_parse_port(struct sfp_bus *bus,

				 const struct sfp_eeprom_id *id,

				 unsigned long *support)

{

	return PORT_OTHER;

}



static inline bool sfp_may_have_phy(struct sfp_bus *bus,

				    const struct sfp_eeprom_id *id)

{

	return false;

}



static inline void sfp_parse_support(struct sfp_bus *bus,

				     const struct sfp_eeprom_id *id,

				     unsigned long *support,

				     unsigned long *interfaces)

{

}



static inline phy_interface_t sfp_select_interface(struct sfp_bus *bus,

						const unsigned long *link_modes)

{