Re: [PATCH net-next v2 04/10] net: pcs: xpcs: Convert xpcs_compat to dw_xpcs_compat

From: Abhishek Chauhan (ABC)
Date: Wed Jun 05 2024 - 15:17:22 EST



> @@ -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] = {
> },
> };
>
Serge, Thank you for raising these patches. Minor comments which shows warning on my workspace.

WARNING: line length of 82 exceeds 80 columns
#153: FILE: drivers/net/pcs/pcs-xpcs.c:1272:
+static const struct dw_xpcs_compat synopsys_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

WARNING: line length of 85 exceeds 80 columns
#162: FILE: drivers/net/pcs/pcs-xpcs.c:1317:
+static const struct dw_xpcs_compat nxp_sja1105_xpcs_compat[DW_XPCS_INTERFACE_MAX] = {

WARNING: line length of 85 exceeds 80 columns
#171: FILE: drivers/net/pcs/pcs-xpcs.c:1327:
+static const struct dw_xpcs_compat nxp_sja1110_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)