mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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: Tilman Schmidt <tilman@imap.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f86936ff38
commit
7643ffbd02
1 changed files with 5 additions and 11 deletions
|
@ -362,7 +362,7 @@ struct event_t *gigaset_add_event(struct cardstate *cs,
|
|||
}
|
||||
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;
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
free_strings(at_state);
|
||||
}
|
||||
|
||||
static void dealloc_at_states(struct cardstate *cs)
|
||||
static void dealloc_temp_at_states(struct cardstate *cs)
|
||||
{
|
||||
struct at_state_t *cur, *next;
|
||||
|
||||
list_for_each_entry_safe(cur, next, &cs->temp_at_states, list) {
|
||||
list_del(&cur->list);
|
||||
free_strings(cur);
|
||||
clear_at_state(cur);
|
||||
kfree(cur);
|
||||
}
|
||||
}
|
||||
|
@ -512,7 +507,7 @@ void gigaset_freecs(struct cardstate *cs)
|
|||
case 1: /* error when registering to LL */
|
||||
gig_dbg(DEBUG_INIT, "clearing at_state");
|
||||
clear_at_state(&cs->at_state);
|
||||
dealloc_at_states(cs);
|
||||
dealloc_temp_at_states(cs);
|
||||
|
||||
/* fall through */
|
||||
case 0: /* error in basic setup */
|
||||
|
@ -848,8 +843,7 @@ static void cleanup_cs(struct cardstate *cs)
|
|||
cs->mstate = MS_UNINITIALIZED;
|
||||
|
||||
clear_at_state(&cs->at_state);
|
||||
dealloc_at_states(cs);
|
||||
free_strings(&cs->at_state);
|
||||
dealloc_temp_at_states(cs);
|
||||
gigaset_at_init(&cs->at_state, NULL, cs, 0);
|
||||
|
||||
cs->inbuf->inputstate = INS_command;
|
||||
|
|
Loading…
Reference in a new issue