Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
93c303d2
Commit
93c303d2
authored
Apr 11, 2018
by
Corey Minyard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipmi_si: Clean up shutdown a bit
Signed-off-by:
Corey Minyard
<
cminyard@mvista.com
>
parent
57bccb4e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
21 deletions
+11
-21
drivers/char/ipmi/ipmi_si_intf.c
drivers/char/ipmi/ipmi_si_intf.c
+11
-21
No files found.
drivers/char/ipmi/ipmi_si_intf.c
View file @
93c303d2
...
@@ -261,7 +261,6 @@ static int num_max_busy_us;
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment