Skip to content

Commit

Permalink
isdn/gigaset: internal function name cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tilman Schmidt authored and David S. Miller committed May 8, 2012
1 parent f86936f commit 7643ffb
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions drivers/isdn/gigaset/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
}
}
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7643ffb

Please sign in to comment.