Commit 410232ab authored by Serge Semin's avatar Serge Semin Committed by David S. Miller
Browse files

net: pcs: xpcs: Convert xpcs_compat to dw_xpcs_compat 



The xpcs_compat structure has been left as the only dw-prefix-less
structure since the previous commit. Let's unify at least the structures
naming in the driver by adding the dw_-prefix to it.

Signed-off-by: default avatarSerge Semin <fancer.lancer@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71b200b3

drivers/net/pcs/pcs-xpcs.c

+19 −19
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ enum { 
	DW_XPCS_INTERFACE_MAX,

};



struct xpcs_compat {

struct dw_xpcs_compat {

	const int *supported;

	const phy_interface_t *interface;

	int num_interfaces;
@@ -154,16 +154,16 @@ struct xpcs_compat { 
struct dw_xpcs_desc {

	u32 id;

	u32 mask;

	const struct xpcs_compat *compat;

	const struct dw_xpcs_compat *compat;

};



static const struct xpcs_compat *

static const struct dw_xpcs_compat *

xpcs_find_compat(const struct dw_xpcs_desc *desc, phy_interface_t interface)

{

	int i, j;



	for (i = 0; i < DW_XPCS_INTERFACE_MAX; i++) {

		const struct xpcs_compat *compat = &desc->compat[i];

		const struct dw_xpcs_compat *compat = &desc->compat[i];



		for (j = 0; j < compat->num_interfaces; j++)

			if (compat->interface[j] == interface)
@@ -175,7 +175,7 @@ xpcs_find_compat(const struct dw_xpcs_desc *desc, phy_interface_t interface) 


int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface)

{

	const struct xpcs_compat *compat;

	const struct dw_xpcs_compat *compat;



	compat = xpcs_find_compat(xpcs->desc, interface);

	if (!compat)
@@ -185,7 +185,7 @@ int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface) 
}

EXPORT_SYMBOL_GPL(xpcs_get_an_mode);



static bool __xpcs_linkmode_supported(const struct xpcs_compat *compat,

static bool __xpcs_linkmode_supported(const struct dw_xpcs_compat *compat,

				      enum ethtool_link_mode_bit_indices linkmode)

{

	int i;
@@ -277,7 +277,7 @@ static int xpcs_poll_reset(struct dw_xpcs *xpcs, int dev) 
}



static int xpcs_soft_reset(struct dw_xpcs *xpcs,

			   const struct xpcs_compat *compat)

			   const struct dw_xpcs_compat *compat)

{

	int ret, dev;
@@ -418,7 +418,7 @@ static void xpcs_config_usxgmii(struct dw_xpcs *xpcs, int speed) 
}



static int _xpcs_config_aneg_c73(struct dw_xpcs *xpcs,

				 const struct xpcs_compat *compat)

				 const struct dw_xpcs_compat *compat)

{

	int ret, adv;
@@ -463,7 +463,7 @@ static int _xpcs_config_aneg_c73(struct dw_xpcs *xpcs, 
}



static int xpcs_config_aneg_c73(struct dw_xpcs *xpcs,

				const struct xpcs_compat *compat)

				const struct dw_xpcs_compat *compat)

{

	int ret;
@@ -482,7 +482,7 @@ static int xpcs_config_aneg_c73(struct dw_xpcs *xpcs, 


static int xpcs_aneg_done_c73(struct dw_xpcs *xpcs,

			      struct phylink_link_state *state,

			      const struct xpcs_compat *compat, u16 an_stat1)

			      const struct dw_xpcs_compat *compat, u16 an_stat1)

{

	int ret;
@@ -607,7 +607,7 @@ static int xpcs_validate(struct phylink_pcs *pcs, unsigned long *supported, 
			 const struct phylink_link_state *state)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(xpcs_supported) = { 0, };

	const struct xpcs_compat *compat;

	const struct dw_xpcs_compat *compat;

	struct dw_xpcs *xpcs;

	int i;
@@ -633,7 +633,7 @@ void xpcs_get_interfaces(struct dw_xpcs *xpcs, unsigned long *interfaces) 
	int i, j;



	for (i = 0; i < DW_XPCS_INTERFACE_MAX; i++) {

		const struct xpcs_compat *compat = &xpcs->desc->compat[i];

		const struct dw_xpcs_compat *compat = &xpcs->desc->compat[i];



		for (j = 0; j < compat->num_interfaces; j++)

			__set_bit(compat->interface[j], interfaces);
@@ -850,7 +850,7 @@ static int xpcs_config_2500basex(struct dw_xpcs *xpcs) 
int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,

		   const unsigned long *advertising, unsigned int neg_mode)

{

	const struct xpcs_compat *compat;

	const struct dw_xpcs_compat *compat;

	int ret;



	compat = xpcs_find_compat(xpcs->desc, interface);
@@ -915,7 +915,7 @@ static int xpcs_config(struct phylink_pcs *pcs, unsigned int neg_mode, 


static int xpcs_get_state_c73(struct dw_xpcs *xpcs,

			      struct phylink_link_state *state,

			      const struct xpcs_compat *compat)

			      const struct dw_xpcs_compat *compat)

{

	bool an_enabled;

	int pcs_stat1;
@@ -1115,7 +1115,7 @@ static void xpcs_get_state(struct phylink_pcs *pcs, 
			   struct phylink_link_state *state)

{

	struct dw_xpcs *xpcs = phylink_pcs_to_xpcs(pcs);

	const struct xpcs_compat *compat;

	const struct dw_xpcs_compat *compat;

	int ret;



	compat = xpcs_find_compat(xpcs->desc, state->interface);
@@ -1269,7 +1269,7 @@ static u32 xpcs_get_id(struct dw_xpcs *xpcs) 
	return 0xffffffff;

}



static const struct xpcs_compat synopsys_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

static const struct dw_xpcs_compat synopsys_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

	[DW_XPCS_USXGMII] = {

		.supported = xpcs_usxgmii_features,

		.interface = xpcs_usxgmii_interfaces,
@@ -1314,7 +1314,7 @@ static const struct xpcs_compat synopsys_xpcs_compat[DW_XPCS_INTERFACE_MAX] = { 
	},

};



static const struct xpcs_compat nxp_sja1105_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

static const struct dw_xpcs_compat nxp_sja1105_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

	[DW_XPCS_SGMII] = {

		.supported = xpcs_sgmii_features,

		.interface = xpcs_sgmii_interfaces,
@@ -1324,7 +1324,7 @@ static const struct xpcs_compat nxp_sja1105_xpcs_compat[DW_XPCS_INTERFACE_MAX] = 
	},

};



static const struct xpcs_compat nxp_sja1110_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

static const struct dw_xpcs_compat nxp_sja1110_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

	[DW_XPCS_SGMII] = {

		.supported = xpcs_sgmii_features,

		.interface = xpcs_sgmii_interfaces,
@@ -1418,7 +1418,7 @@ static int xpcs_init_id(struct dw_xpcs *xpcs) 


static int xpcs_init_iface(struct dw_xpcs *xpcs, phy_interface_t interface)

{

	const struct xpcs_compat *compat;

	const struct dw_xpcs_compat *compat;



	compat = xpcs_find_compat(xpcs->desc, interface);

	if (!compat)