mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-20 04:44:26 +08:00
mlxsw: core: Remove mlxsw_core_is_initialized()
After the previous patch, the switch driver is always initialized last, making this function redundant. Remove it. Signed-off-by: Ido Schimmel <idosch@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3d7a6f6779
commit
25a91f835a
@ -90,7 +90,6 @@ struct mlxsw_core {
|
||||
struct devlink_health_reporter *fw_fatal;
|
||||
} health;
|
||||
struct mlxsw_env *env;
|
||||
bool is_initialized; /* Denotes if core was already initialized. */
|
||||
unsigned long driver_priv[];
|
||||
/* driver_priv has to be always the last item */
|
||||
};
|
||||
@ -2014,7 +2013,6 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info,
|
||||
goto err_driver_init;
|
||||
}
|
||||
|
||||
mlxsw_core->is_initialized = true;
|
||||
devlink_params_publish(devlink);
|
||||
|
||||
if (!reload)
|
||||
@ -2099,7 +2097,6 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core,
|
||||
}
|
||||
|
||||
devlink_params_unpublish(devlink);
|
||||
mlxsw_core->is_initialized = false;
|
||||
if (mlxsw_core->driver->fini)
|
||||
mlxsw_core->driver->fini(mlxsw_core);
|
||||
mlxsw_env_fini(mlxsw_core->env);
|
||||
@ -2938,11 +2935,6 @@ struct mlxsw_env *mlxsw_core_env(const struct mlxsw_core *mlxsw_core)
|
||||
return mlxsw_core->env;
|
||||
}
|
||||
|
||||
bool mlxsw_core_is_initialized(const struct mlxsw_core *mlxsw_core)
|
||||
{
|
||||
return mlxsw_core->is_initialized;
|
||||
}
|
||||
|
||||
static void mlxsw_core_buf_dump_dbg(struct mlxsw_core *mlxsw_core,
|
||||
const char *buf, size_t size)
|
||||
{
|
||||
|
@ -249,7 +249,6 @@ mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,
|
||||
u8 local_port);
|
||||
bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u8 local_port);
|
||||
struct mlxsw_env *mlxsw_core_env(const struct mlxsw_core *mlxsw_core);
|
||||
bool mlxsw_core_is_initialized(const struct mlxsw_core *mlxsw_core);
|
||||
|
||||
int mlxsw_core_schedule_dw(struct delayed_work *dwork, unsigned long delay);
|
||||
bool mlxsw_core_schedule_work(struct work_struct *work);
|
||||
|
@ -667,12 +667,6 @@ mlxsw_env_module_overheat_counter_get(struct mlxsw_core *mlxsw_core, u8 module,
|
||||
{
|
||||
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
|
||||
|
||||
/* Prevent switch driver from accessing uninitialized data. */
|
||||
if (!mlxsw_core_is_initialized(mlxsw_core)) {
|
||||
*p_counter = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
|
||||
return -EINVAL;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user