Commit ea47e70e authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

net: phy: remove fixup-related definitions from phy.h which are not used outside phylib 



Certain fixup-related definitions aren't used outside phy_device.c.
So make them private and remove them from phy.h.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/ea6fde13-9183-4c7c-8434-6c0eb64fc72c@gmail.com


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

drivers/net/phy/phy_device.c

+13 −3
Original line number Diff line number Diff line
@@ -45,6 +45,17 @@ MODULE_DESCRIPTION("PHY library"); 
MODULE_AUTHOR("Andy Fleming");

MODULE_LICENSE("GPL");



#define	PHY_ANY_ID	"MATCH ANY PHY"

#define	PHY_ANY_UID	0xffffffff



struct phy_fixup {

	struct list_head list;

	char bus_id[MII_BUS_ID_SIZE + 3];

	u32 phy_uid;

	u32 phy_uid_mask;

	int (*run)(struct phy_device *phydev);

};



__ETHTOOL_DECLARE_LINK_MODE_MASK(phy_basic_features) __ro_after_init;

EXPORT_SYMBOL_GPL(phy_basic_features);
@@ -378,7 +389,7 @@ static SIMPLE_DEV_PM_OPS(mdio_bus_phy_pm_ops, mdio_bus_phy_suspend, 
 *	comparison

 * @run: The actual code to be run when a matching PHY is found

 */

int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

static int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

			      int (*run)(struct phy_device *))

{

	struct phy_fixup *fixup = kzalloc(sizeof(*fixup), GFP_KERNEL);
@@ -397,7 +408,6 @@ int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask, 


	return 0;

}

EXPORT_SYMBOL(phy_register_fixup);



/* Registers a fixup to be run on any PHY with the UID in phy_uid */

int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,

include/linux/phy.h

+0 −14
Original line number Diff line number Diff line
@@ -1287,9 +1287,6 @@ struct phy_driver { 
#define to_phy_driver(d) container_of_const(to_mdio_common_driver(d),		\

				      struct phy_driver, mdiodrv)



#define PHY_ANY_ID "MATCH ANY PHY"

#define PHY_ANY_UID 0xffffffff



#define PHY_ID_MATCH_EXACT(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 0)

#define PHY_ID_MATCH_MODEL(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 4)

#define PHY_ID_MATCH_VENDOR(id) .phy_id = (id), .phy_id_mask = GENMASK(31, 10)
@@ -1322,15 +1319,6 @@ static inline bool phydev_id_compare(struct phy_device *phydev, u32 id) 
	return phy_id_compare(id, phydev->phy_id, phydev->drv->phy_id_mask);

}



/* A Structure for boards to register fixups with the PHY Lib */

struct phy_fixup {

	struct list_head list;

	char bus_id[MII_BUS_ID_SIZE + 3];

	u32 phy_uid;

	u32 phy_uid_mask;

	int (*run)(struct phy_device *phydev);

};



const char *phy_speed_to_str(int speed);

const char *phy_duplex_to_str(unsigned int duplex);

const char *phy_rate_matching_to_str(int rate_matching);
@@ -2127,8 +2115,6 @@ s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev, 
void phy_resolve_pause(unsigned long *local_adv, unsigned long *partner_adv,

		       bool *tx_pause, bool *rx_pause);



int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

		       int (*run)(struct phy_device *));

int phy_register_fixup_for_id(const char *bus_id,

			      int (*run)(struct phy_device *));

int phy_register_fixup_for_uid(u32 phy_uid, u32 phy_uid_mask,