net: pcs: xpcs: Convert xpcs_id to dw_xpcs_desc

A structure with the PCS/PMA MMD IDs data is being introduced in one of
the next commits. In order to prevent the names ambiguity let's convert
the xpcs_id structure name to dw_xpcs_desc. The later version is more
suitable since the structure content is indeed the device descriptor
containing the data and callbacks required for the driver to correctly set
the device up.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 2dcfd0ff069ad61e69b106f6640fcdda4545395d..4ed29df8c96315042db90a015ce1199ace07a45c 100644 (file)
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -151,19 +151,19 @@ struct xpcs_compat {
        int (*pma_config)(struct dw_xpcs *xpcs);
 };
 
-struct xpcs_id {
+struct dw_xpcs_desc {
        u32 id;
        u32 mask;
        const struct xpcs_compat *compat;
 };
 
-static const struct xpcs_compat *xpcs_find_compat(const struct xpcs_id *id,
-                                                 phy_interface_t interface)
+static const struct 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 = &id->compat[i];
+               const struct xpcs_compat *compat = &desc->compat[i];
 
                for (j = 0; j < compat->num_interfaces; j++)
                        if (compat->interface[j] == interface)
@@ -177,7 +177,7 @@ int xpcs_get_an_mode(struct dw_xpcs *xpcs, phy_interface_t interface)
 {
        const struct xpcs_compat *compat;
 
-       compat = xpcs_find_compat(xpcs->id, interface);
+       compat = xpcs_find_compat(xpcs->desc, interface);
        if (!compat)
                return -ENODEV;
 
@@ -612,7 +612,7 @@ static int xpcs_validate(struct phylink_pcs *pcs, unsigned long *supported,
        int i;
 
        xpcs = phylink_pcs_to_xpcs(pcs);
-       compat = xpcs_find_compat(xpcs->id, state->interface);
+       compat = xpcs_find_compat(xpcs->desc, state->interface);
        if (!compat)
                return -EINVAL;
 
@@ -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->id->compat[i];
+               const struct xpcs_compat *compat = &xpcs->desc->compat[i];
 
                for (j = 0; j < compat->num_interfaces; j++)
                        __set_bit(compat->interface[j], interfaces);
@@ -853,7 +853,7 @@ int xpcs_do_config(struct dw_xpcs *xpcs, phy_interface_t interface,
        const struct xpcs_compat *compat;
        int ret;
 
-       compat = xpcs_find_compat(xpcs->id, interface);
+       compat = xpcs_find_compat(xpcs->desc, interface);
        if (!compat)
                return -ENODEV;
 
@@ -1118,7 +1118,7 @@ static void xpcs_get_state(struct phylink_pcs *pcs,
        const struct xpcs_compat *compat;
        int ret;
 
-       compat = xpcs_find_compat(xpcs->id, state->interface);
+       compat = xpcs_find_compat(xpcs->desc, state->interface);
        if (!compat)
                return;
 
@@ -1341,7 +1341,7 @@ static const struct xpcs_compat nxp_sja1110_xpcs_compat[DW_XPCS_INTERFACE_MAX] =
        },
 };
 
-static const struct xpcs_id xpcs_id_list[] = {
+static const struct dw_xpcs_desc xpcs_desc_list[] = {
        {
                .id = DW_XPCS_ID,
                .mask = DW_XPCS_ID_MASK,
@@ -1395,18 +1395,18 @@ static int xpcs_init_id(struct dw_xpcs *xpcs)
 
        xpcs_id = xpcs_get_id(xpcs);
 
-       for (i = 0; i < ARRAY_SIZE(xpcs_id_list); i++) {
-               const struct xpcs_id *entry = &xpcs_id_list[i];
+       for (i = 0; i < ARRAY_SIZE(xpcs_desc_list); i++) {
+               const struct dw_xpcs_desc *desc = &xpcs_desc_list[i];
 
-               if ((xpcs_id & entry->mask) != entry->id)
+               if ((xpcs_id & desc->mask) != desc->id)
                        continue;
 
-               xpcs->id = entry;
+               xpcs->desc = desc;
 
                break;
        }
 
-       if (!xpcs->id)
+       if (!xpcs->desc)
                return -ENODEV;
 
        ret = xpcs_dev_flag(xpcs);
@@ -1420,7 +1420,7 @@ static int xpcs_init_iface(struct dw_xpcs *xpcs, phy_interface_t interface)
 {
        const struct xpcs_compat *compat;
 
-       compat = xpcs_find_compat(xpcs->id, interface);
+       compat = xpcs_find_compat(xpcs->desc, interface);
        if (!compat)
                return -EINVAL;
 

diff --git a/include/linux/pcs/pcs-xpcs.h b/include/linux/pcs/pcs-xpcs.h
index 8dfe90295f125e67c35ef964cd467e0711e5e7c3..e706bd16b986d8e0be6d1e70b97be0d7ca8cfbfa 100644 (file)
--- a/include/linux/pcs/pcs-xpcs.h
+++ b/include/linux/pcs/pcs-xpcs.h
@@ -28,11 +28,11 @@
 /* dev_flag */
 #define DW_DEV_TXGBE                   BIT(0)
 
-struct xpcs_id;
+struct dw_xpcs_desc;
 
 struct dw_xpcs {
+       const struct dw_xpcs_desc *desc;
        struct mdio_device *mdiodev;
-       const struct xpcs_id *id;
        struct phylink_pcs pcs;
        phy_interface_t interface;
        int dev_flag;