renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 06:04:14 +08:00
Code

ipmi_si: Clean up shutdown a bit

Browse Source 
Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
Corey Minyard 2018-04-11 13:53:52 -05:00
parent 57bccb4e87
commit 93c303d204
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -261,7 +261,6 @@ static int num_max_busy_us;
static bool unload_when_empty = true; static bool unload_when_empty = true;
static int try_smi_init(struct smi_info *smi); static int try_smi_init(struct smi_info *smi);
static void shutdown_one_si(struct smi_info *smi_info);
static void cleanup_one_si(struct smi_info *smi_info); static void cleanup_one_si(struct smi_info *smi_info);
static void cleanup_ipmi_si(void); static void cleanup_ipmi_si(void);
@ -2003,14 +2002,8 @@ int ipmi_si_add_smi(struct si_sm_io *io)
list_add_tail(&new_smi->link, &smi_infos); list_add_tail(&new_smi->link, &smi_infos);
if (initialized) { if (initialized)
rv = try_smi_init(new_smi); rv = try_smi_init(new_smi);
if (rv) {
cleanup_one_si(new_smi);
mutex_unlock(&smi_infos_lock);
return rv;
}
}
out_err: out_err:
mutex_unlock(&smi_infos_lock); mutex_unlock(&smi_infos_lock);
return rv; return rv;
@ -2220,7 +2213,8 @@ static int try_smi_init(struct smi_info *new_smi)
return 0; return 0;
out_err: out_err:
shutdown_one_si(new_smi); ipmi_unregister_smi(new_smi->intf);
new_smi->intf = NULL;
kfree(init_name); kfree(init_name);
@ -2358,17 +2352,10 @@ static void shutdown_smi(void *send_info)
smi_info->si_sm = NULL; smi_info->si_sm = NULL;
} }
static void shutdown_one_si(struct smi_info *smi_info) /*
{ * Must be called with smi_infos_lock held, to serialize the
ipmi_smi_t intf = smi_info->intf; * smi_info->intf check.
*/
if (!intf)
return;
smi_info->intf = NULL;
ipmi_unregister_smi(intf);
}
static void cleanup_one_si(struct smi_info *smi_info) static void cleanup_one_si(struct smi_info *smi_info)
{ {
if (!smi_info) if (!smi_info)
@ -2376,7 +2363,10 @@ static void cleanup_one_si(struct smi_info *smi_info)
list_del(&smi_info->link); list_del(&smi_info->link);
shutdown_one_si(smi_info); if (smi_info->intf) {
ipmi_unregister_smi(smi_info->intf);
smi_info->intf = NULL;
}
if (smi_info->pdev) { if (smi_info->pdev) {
if (smi_info->pdev_registered) if (smi_info->pdev_registered)