提交 7643ffbd 编写于 作者: T Tilman Schmidt 提交者: David S. Miller

isdn/gigaset: internal function name cleanup

Functions clear_at_state and free_strings did the same thing;
drop one of them, keeping the more descriptive name.
Drop a redundant call.
Rename function dealloc_at_states to dealloc_temp_at_states
to clarify its purpose.
Signed-off-by: NTilman Schmidt <tilman@imap.cc>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f86936ff
...@@ -362,7 +362,7 @@ struct event_t *gigaset_add_event(struct cardstate *cs, ...@@ -362,7 +362,7 @@ struct event_t *gigaset_add_event(struct cardstate *cs,
} }
EXPORT_SYMBOL_GPL(gigaset_add_event); EXPORT_SYMBOL_GPL(gigaset_add_event);
static void free_strings(struct at_state_t *at_state) static void clear_at_state(struct at_state_t *at_state)
{ {
int i; int i;
...@@ -372,18 +372,13 @@ static void free_strings(struct at_state_t *at_state) ...@@ -372,18 +372,13 @@ static void free_strings(struct at_state_t *at_state)
} }
} }
static void clear_at_state(struct at_state_t *at_state) static void dealloc_temp_at_states(struct cardstate *cs)
{
free_strings(at_state);
}
static void dealloc_at_states(struct cardstate *cs)
{ {
struct at_state_t *cur, *next; struct at_state_t *cur, *next;
list_for_each_entry_safe(cur, next, &cs->temp_at_states, list) { list_for_each_entry_safe(cur, next, &cs->temp_at_states, list) {
list_del(&cur->list); list_del(&cur->list);
free_strings(cur); clear_at_state(cur);
kfree(cur); kfree(cur);
} }
} }
...@@ -512,7 +507,7 @@ void gigaset_freecs(struct cardstate *cs) ...@@ -512,7 +507,7 @@ void gigaset_freecs(struct cardstate *cs)
case 1: /* error when registering to LL */ case 1: /* error when registering to LL */
gig_dbg(DEBUG_INIT, "clearing at_state"); gig_dbg(DEBUG_INIT, "clearing at_state");
clear_at_state(&cs->at_state); clear_at_state(&cs->at_state);
dealloc_at_states(cs); dealloc_temp_at_states(cs);
/* fall through */ /* fall through */
case 0: /* error in basic setup */ case 0: /* error in basic setup */
...@@ -848,8 +843,7 @@ static void cleanup_cs(struct cardstate *cs) ...@@ -848,8 +843,7 @@ static void cleanup_cs(struct cardstate *cs)
cs->mstate = MS_UNINITIALIZED; cs->mstate = MS_UNINITIALIZED;
clear_at_state(&cs->at_state); clear_at_state(&cs->at_state);
dealloc_at_states(cs); dealloc_temp_at_states(cs);
free_strings(&cs->at_state);
gigaset_at_init(&cs->at_state, NULL, cs, 0); gigaset_at_init(&cs->at_state, NULL, cs, 0);
cs->inbuf->inputstate = INS_command; cs->inbuf->inputstate = INS_command;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册