diff options
| author |   Jiri Pirko <jiri@mellanox.com> | 2018-04-01 17:34:57 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-01 10:56:43 -0400 |
| commit | ad3f20b28602fd46b3a27b5a61be270a3794cc36 (patch) | |
| tree | 68c04dfe9433f582d449d177650d4189029427d8 /drivers/net/ethernet/mellanox/mlxsw/pci.c | |
| parent | mlxsw: Move "used_kvd_sizes" check to mlxsw_pci_config_profile (diff) | |
| download | linux-dev-ad3f20b28602fd46b3a27b5a61be270a3794cc36.tar.xz linux-dev-ad3f20b28602fd46b3a27b5a61be270a3794cc36.zip | |
mlxsw: Move "resources_query_enable" out of mlxsw_config_profile
As struct mlxsw_config_profile is mapped to the payload of the FW
command of the same name, resources_query_enable flag does not belong
there. Move it to struct mlxsw_driver.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlxsw/pci.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlxsw/pci.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c index 5ab068aec033..3a9381977d6d 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/pci.c +++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c @@ -1015,16 +1015,14 @@ mlxsw_pci_config_profile_swid_config(struct mlxsw_pci *mlxsw_pci, } static int mlxsw_pci_resources_query(struct mlxsw_pci *mlxsw_pci, char *mbox, - struct mlxsw_res *res, - u8 query_enabled) + struct mlxsw_res *res) { int index, i; u64 data; u16 id; int err; - /* Not all the versions support resources query */ - if (!query_enabled) + if (!res) return 0; mlxsw_cmd_mbox_zero(mbox); @@ -1376,8 +1374,7 @@ static int mlxsw_pci_init(void *bus_priv, struct mlxsw_core *mlxsw_core, if (err) goto err_boardinfo; - err = mlxsw_pci_resources_query(mlxsw_pci, mbox, res, - profile->resource_query_enable); + err = mlxsw_pci_resources_query(mlxsw_pci, mbox, res); if (err) goto err_query_resources; |