mlxsw: spectrum_span: Rename parms() to parms_set()

Use a more meaningful name for parms() function.

Signed-off-by: Amit Cohen <amitc@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
index e7be1bfe7f75727f72d80aa3608670b7fe1523ba..eb4a1c0f2788a01363ec16af9416dcbef1c2d5e5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
@@ -130,7 +130,7 @@ mlxsw_sp_span_entry_phys_deconfigure(struct mlxsw_sp_span_entry *span_entry)
 static const
 struct mlxsw_sp_span_entry_ops mlxsw_sp_span_entry_ops_phys = {
        .can_handle = mlxsw_sp_port_dev_check,
-       .parms = mlxsw_sp_span_entry_phys_parms,
+       .parms_set = mlxsw_sp_span_entry_phys_parms,
        .configure = mlxsw_sp_span_entry_phys_configure,
        .deconfigure = mlxsw_sp_span_entry_phys_deconfigure,
 };
@@ -418,7 +418,7 @@ mlxsw_sp_span_entry_gretap4_deconfigure(struct mlxsw_sp_span_entry *span_entry)
 
 static const struct mlxsw_sp_span_entry_ops mlxsw_sp_span_entry_ops_gretap4 = {
        .can_handle = netif_is_gretap,
-       .parms = mlxsw_sp_span_entry_gretap4_parms,
+       .parms_set = mlxsw_sp_span_entry_gretap4_parms,
        .configure = mlxsw_sp_span_entry_gretap4_configure,
        .deconfigure = mlxsw_sp_span_entry_gretap4_deconfigure,
 };
@@ -519,7 +519,7 @@ mlxsw_sp_span_entry_gretap6_deconfigure(struct mlxsw_sp_span_entry *span_entry)
 static const
 struct mlxsw_sp_span_entry_ops mlxsw_sp_span_entry_ops_gretap6 = {
        .can_handle = netif_is_ip6gretap,
-       .parms = mlxsw_sp_span_entry_gretap6_parms,
+       .parms_set = mlxsw_sp_span_entry_gretap6_parms,
        .configure = mlxsw_sp_span_entry_gretap6_configure,
        .deconfigure = mlxsw_sp_span_entry_gretap6_deconfigure,
 };
@@ -575,7 +575,7 @@ mlxsw_sp_span_entry_vlan_deconfigure(struct mlxsw_sp_span_entry *span_entry)
 static const
 struct mlxsw_sp_span_entry_ops mlxsw_sp_span_entry_ops_vlan = {
        .can_handle = mlxsw_sp_span_vlan_can_handle,
-       .parms = mlxsw_sp_span_entry_vlan_parms,
+       .parms_set = mlxsw_sp_span_entry_vlan_parms,
        .configure = mlxsw_sp_span_entry_vlan_configure,
        .deconfigure = mlxsw_sp_span_entry_vlan_deconfigure,
 };
@@ -612,7 +612,7 @@ mlxsw_sp_span_entry_nop_deconfigure(struct mlxsw_sp_span_entry *span_entry)
 }
 
 static const struct mlxsw_sp_span_entry_ops mlxsw_sp_span_entry_ops_nop = {
-       .parms = mlxsw_sp_span_entry_nop_parms,
+       .parms_set = mlxsw_sp_span_entry_nop_parms,
        .configure = mlxsw_sp_span_entry_nop_configure,
        .deconfigure = mlxsw_sp_span_entry_nop_deconfigure,
 };
@@ -970,7 +970,7 @@ int mlxsw_sp_span_mirror_add(struct mlxsw_sp_port *from,
                return -EOPNOTSUPP;
        }
 
-       err = ops->parms(to_dev, &sparms);
+       err = ops->parms_set(to_dev, &sparms);
        if (err)
                return err;
 
@@ -1026,7 +1026,7 @@ static void mlxsw_sp_span_respin_work(struct work_struct *work)
                if (!curr->ref_count)
                        continue;
 
-               err = curr->ops->parms(curr->to_dev, &sparms);
+               err = curr->ops->parms_set(curr->to_dev, &sparms);
                if (err)
                        continue;
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h
index 59724335525f279b7089ced52670b90d85c2b430..01273e54ba2062501f58e0c86749455d6b337a2e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.h
@@ -49,8 +49,8 @@ struct mlxsw_sp_span_entry {
 
 struct mlxsw_sp_span_entry_ops {
        bool (*can_handle)(const struct net_device *to_dev);
-       int (*parms)(const struct net_device *to_dev,
-                    struct mlxsw_sp_span_parms *sparmsp);
+       int (*parms_set)(const struct net_device *to_dev,
+                        struct mlxsw_sp_span_parms *sparmsp);
        int (*configure)(struct mlxsw_sp_span_entry *span_entry,
                         struct mlxsw_sp_span_parms sparms);
        void (*deconfigure)(struct mlxsw_sp_span_entry *span_entry);