Commit f2972ea1 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-phy-clean-up-phy-package-mmd-access-functions' 

Heiner Kallweit says:

====================
net: phy: clean up PHY package MMD access functions

Move declarations of the functions with users to phylib.h, and remove
unused functions.
====================

Link: https://patch.msgid.link/b624fcb7-b493-461a-a0b5-9ca7e9d767bc@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 89694a56 8ea221b2

drivers/net/phy/phy-core.c

+0 −75
Original line number Diff line number Diff line
@@ -734,43 +734,6 @@ int __phy_package_read_mmd(struct phy_device *phydev, 
}

EXPORT_SYMBOL(__phy_package_read_mmd);



/**

 * phy_package_read_mmd - read MMD reg relative to PHY package base addr

 * @phydev: The phy_device struct

 * @addr_offset: The offset to be added to PHY package base_addr

 * @devad: The MMD to read from

 * @regnum: The register on the MMD to read

 *

 * Convenience helper for reading a register of an MMD on a given PHY

 * using the PHY package base address. The base address is added to

 * the addr_offset value.

 *

 * Same calling rules as for phy_read();

 *

 * NOTE: It's assumed that the entire PHY package is either C22 or C45.

 */

int phy_package_read_mmd(struct phy_device *phydev,

			 unsigned int addr_offset, int devad,

			 u32 regnum)

{

	int addr = phy_package_address(phydev, addr_offset);

	int val;



	if (addr < 0)

		return addr;



	if (regnum > (u16)~0 || devad > 32)

		return -EINVAL;



	phy_lock_mdio_bus(phydev);

	val = mmd_phy_read(phydev->mdio.bus, addr, phydev->is_c45, devad,

			   regnum);

	phy_unlock_mdio_bus(phydev);



	return val;

}

EXPORT_SYMBOL(phy_package_read_mmd);



/**

 * __phy_package_write_mmd - write MMD reg relative to PHY package base addr

 * @phydev: The phy_device struct
@@ -804,44 +767,6 @@ int __phy_package_write_mmd(struct phy_device *phydev, 
}

EXPORT_SYMBOL(__phy_package_write_mmd);



/**

 * phy_package_write_mmd - write MMD reg relative to PHY package base addr

 * @phydev: The phy_device struct

 * @addr_offset: The offset to be added to PHY package base_addr

 * @devad: The MMD to write to

 * @regnum: The register on the MMD to write

 * @val: value to write to @regnum

 *

 * Convenience helper for writing a register of an MMD on a given PHY

 * using the PHY package base address. The base address is added to

 * the addr_offset value.

 *

 * Same calling rules as for phy_write();

 *

 * NOTE: It's assumed that the entire PHY package is either C22 or C45.

 */

int phy_package_write_mmd(struct phy_device *phydev,

			  unsigned int addr_offset, int devad,

			  u32 regnum, u16 val)

{

	int addr = phy_package_address(phydev, addr_offset);

	int ret;



	if (addr < 0)

		return addr;



	if (regnum > (u16)~0 || devad > 32)

		return -EINVAL;



	phy_lock_mdio_bus(phydev);

	ret = mmd_phy_write(phydev->mdio.bus, addr, phydev->is_c45, devad,

			    regnum, val);

	phy_unlock_mdio_bus(phydev);



	return ret;

}

EXPORT_SYMBOL(phy_package_write_mmd);



/**

 * phy_modify_changed - Function for modifying a PHY register

 * @phydev: the phy_device struct

drivers/net/phy/phylib.h

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ int __phy_package_read(struct phy_device *phydev, unsigned int addr_offset, 
		       u32 regnum);

int __phy_package_write(struct phy_device *phydev, unsigned int addr_offset,

			u32 regnum, u16 val);

int __phy_package_read_mmd(struct phy_device *phydev,

			   unsigned int addr_offset, int devad,

			   u32 regnum);

int __phy_package_write_mmd(struct phy_device *phydev,

			    unsigned int addr_offset, int devad,

			    u32 regnum, u16 val);

bool phy_package_init_once(struct phy_device *phydev);

bool phy_package_probe_once(struct phy_device *phydev);

int phy_package_join(struct phy_device *phydev, int base_addr, size_t priv_size);

include/linux/phy.h

+0 −16
Original line number Diff line number Diff line
@@ -2107,22 +2107,6 @@ int __phy_hwtstamp_set(struct phy_device *phydev, 
		       struct kernel_hwtstamp_config *config,

		       struct netlink_ext_ack *extack);



int __phy_package_read_mmd(struct phy_device *phydev,

			   unsigned int addr_offset, int devad,

			   u32 regnum);



int phy_package_read_mmd(struct phy_device *phydev,

			 unsigned int addr_offset, int devad,

			 u32 regnum);



int __phy_package_write_mmd(struct phy_device *phydev,

			    unsigned int addr_offset, int devad,

			    u32 regnum, u16 val);



int phy_package_write_mmd(struct phy_device *phydev,

			  unsigned int addr_offset, int devad,

			  u32 regnum, u16 val);



extern const struct bus_type mdio_bus_type;



struct mdio_board_info {