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

net: phy: remove remaining PHY package related definitions from phy.h 



Move definition of struct phy_package_shared to phy_package.c, and
move remaining PHY package related declarations from phy.h to
phylib.h, thus making them accessible for PHY drivers only.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/211e14b6-e2f8-43d7-b533-3628ec548456@gmail.com


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

drivers/net/phy/phy_package.c

+31 −0
Original line number Diff line number Diff line
@@ -9,6 +9,37 @@ 
#include "phylib.h"

#include "phylib-internal.h"



/**

 * struct phy_package_shared - Shared information in PHY packages

 * @base_addr: Base PHY address of PHY package used to combine PHYs

 *   in one package and for offset calculation of phy_package_read/write

 * @np: Pointer to the Device Node if PHY package defined in DT

 * @refcnt: Number of PHYs connected to this shared data

 * @flags: Initialization of PHY package

 * @priv_size: Size of the shared private data @priv

 * @priv: Driver private data shared across a PHY package

 *

 * Represents a shared structure between different phydev's in the same

 * package, for example a quad PHY. See phy_package_join() and

 * phy_package_leave().

 */

struct phy_package_shared {

	u8 base_addr;

	/* With PHY package defined in DT this points to the PHY package node */

	struct device_node *np;

	refcount_t refcnt;

	unsigned long flags;

	size_t priv_size;



	/* private data pointer */

	/* note that this pointer is shared between different phydevs and

	 * the user has to take care of appropriate locking. It is allocated

	 * and freed automatically by phy_package_join() and

	 * phy_package_leave().

	 */

	void *priv;

};



struct device_node *phy_package_get_node(struct phy_device *phydev)

{

	return phydev->shared->np;

drivers/net/phy/phylib.h

+7 −0
Original line number Diff line number Diff line
@@ -17,5 +17,12 @@ int __phy_package_write(struct phy_device *phydev, unsigned int addr_offset, 
			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);

int of_phy_package_join(struct phy_device *phydev, size_t priv_size);

void phy_package_leave(struct phy_device *phydev);

int devm_phy_package_join(struct device *dev, struct phy_device *phydev,

			  int base_addr, size_t priv_size);

int devm_of_phy_package_join(struct device *dev, struct phy_device *phydev,

			     size_t priv_size);



#endif /* __PHYLIB_H */

include/linux/phy.h

+0 −38
Original line number Diff line number Diff line
@@ -319,37 +319,6 @@ struct mdio_bus_stats { 
	struct u64_stats_sync syncp;

};



/**

 * struct phy_package_shared - Shared information in PHY packages

 * @base_addr: Base PHY address of PHY package used to combine PHYs

 *   in one package and for offset calculation of phy_package_read/write

 * @np: Pointer to the Device Node if PHY package defined in DT

 * @refcnt: Number of PHYs connected to this shared data

 * @flags: Initialization of PHY package

 * @priv_size: Size of the shared private data @priv

 * @priv: Driver private data shared across a PHY package

 *

 * Represents a shared structure between different phydev's in the same

 * package, for example a quad PHY. See phy_package_join() and

 * phy_package_leave().

 */

struct phy_package_shared {

	u8 base_addr;

	/* With PHY package defined in DT this points to the PHY package node */

	struct device_node *np;

	refcount_t refcnt;

	unsigned long flags;

	size_t priv_size;



	/* private data pointer */

	/* note that this pointer is shared between different phydevs and

	 * the user has to take care of appropriate locking. It is allocated

	 * and freed automatically by phy_package_join() and

	 * phy_package_leave().

	 */

	void *priv;

};



/**

 * struct mii_bus - Represents an MDIO bus

 *
@@ -2109,13 +2078,6 @@ int phy_ethtool_get_link_ksettings(struct net_device *ndev, 
int phy_ethtool_set_link_ksettings(struct net_device *ndev,

				   const struct ethtool_link_ksettings *cmd);

int phy_ethtool_nway_reset(struct net_device *ndev);

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

int of_phy_package_join(struct phy_device *phydev, size_t priv_size);

void phy_package_leave(struct phy_device *phydev);

int devm_phy_package_join(struct device *dev, struct phy_device *phydev,

			  int base_addr, size_t priv_size);

int devm_of_phy_package_join(struct device *dev, struct phy_device *phydev,

			     size_t priv_size);



int __init mdio_bus_init(void);

void mdio_bus_exit(void);