mlxsw: cmd: Push resource query defines to cmd.h

Push cmd resource query related defines to cmd.h where they belong.

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

diff --git a/drivers/net/ethernet/mellanox/mlxsw/cmd.h b/drivers/net/ethernet/mellanox/mlxsw/cmd.h
index 28271bedd95711b190934d6939348557600f1fa2..56e19b0d2f8f272d9833159264b2f139c5cee13b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/cmd.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/cmd.h
@@ -513,6 +513,11 @@ static inline int mlxsw_cmd_unmap_fa(struct mlxsw_core *mlxsw_core)
  * are no more sources in the table, will return resource id 0xFFF to indicate
  * it.
  */
+
+#define MLXSW_CMD_QUERY_RESOURCES_TABLE_END_ID 0xffff
+#define MLXSW_CMD_QUERY_RESOURCES_MAX_QUERIES 100
+#define MLXSW_CMD_QUERY_RESOURCES_PER_QUERY 32
+
 static inline int mlxsw_cmd_query_resources(struct mlxsw_core *mlxsw_core,
                                            char *out_mbox, int index)
 {

diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 6f368068aa15c62689ad099078e8fd8c6ae38958..c3b16632bfc5cb44f2f34c0cbc19380d1a72f295 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -1155,7 +1155,6 @@ mlxsw_pci_config_profile_swid_config(struct mlxsw_pci *mlxsw_pci,
        mlxsw_cmd_mbox_config_profile_swid_config_mask_set(mbox, index, mask);
 }
 
-#define MLXSW_RESOURCES_TABLE_END_ID 0xffff
 #define MLXSW_MAX_SPAN_ID 0x2420
 #define MLXSW_MAX_LAG_ID 0x2520
 #define MLXSW_MAX_PORTS_IN_LAG_ID 0x2521
@@ -1167,8 +1166,6 @@ mlxsw_pci_config_profile_swid_config(struct mlxsw_pci *mlxsw_pci,
 #define MLXSW_MAX_VLAN_GROUPS_ID 0x2906
 #define MLXSW_MAX_REGIONS_ID 0x2901
 #define MLXSW_MAX_RIF_ID 0x2C02
-#define MLXSW_RESOURCES_QUERY_MAX_QUERIES 100
-#define MLXSW_RESOURCES_PER_QUERY 32
 
 static void mlxsw_pci_resources_query_parse(int id, u64 val,
                                            struct mlxsw_resources *resources)
@@ -1238,16 +1235,17 @@ static int mlxsw_pci_resources_query(struct mlxsw_pci *mlxsw_pci, char *mbox,
 
        mlxsw_cmd_mbox_zero(mbox);
 
-       for (index = 0; index < MLXSW_RESOURCES_QUERY_MAX_QUERIES; index++) {
+       for (index = 0; index < MLXSW_CMD_QUERY_RESOURCES_MAX_QUERIES;
+            index++) {
                err = mlxsw_cmd_query_resources(mlxsw_pci->core, mbox, index);
                if (err)
                        return err;
 
-               for (i = 0; i < MLXSW_RESOURCES_PER_QUERY; i++) {
+               for (i = 0; i < MLXSW_CMD_QUERY_RESOURCES_PER_QUERY; i++) {
                        id = mlxsw_cmd_mbox_query_resource_id_get(mbox, i);
                        data = mlxsw_cmd_mbox_query_resource_data_get(mbox, i);
 
-                       if (id == MLXSW_RESOURCES_TABLE_END_ID)
+                       if (id == MLXSW_CMD_QUERY_RESOURCES_TABLE_END_ID)
                                return 0;
 
                        mlxsw_pci_resources_query_parse(id, data, resources);