From: Tilman Schmidt <tilman@imap.cc>
To: Karsten Keil <isdn@linux-pingi.de>, David Miller <davem@davemloft.net>
Cc: Hansjoerg Lipp <hjlipp@web.de>, Karsten Keil <keil@b1-systems.de>,
i4ldeveloper@listserv.isdn4linux.de, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/8] isdn/gigaset: internal function name cleanup
Date: Thu, 26 Apr 2012 01:02:20 +0200 (CEST) [thread overview]
Message-ID: <20120425-patch-gigaset-05.tilman@imap.cc> (raw)
In-Reply-To: <20120425-patch-gigaset-00.tilman@imap.cc>
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>
---
drivers/isdn/gigaset/common.c | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 7679270..6c306d4 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -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;
--
1.7.3.4
next prev parent reply other threads:[~2012-04-25 23:02 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-25 23:02 [PATCH 0/8] ISDN patches for net-next Tilman Schmidt
2012-04-25 23:02 ` [PATCH 1/8] isdn/gigaset: ratelimit CAPI message dumps Tilman Schmidt
2012-04-26 6:39 ` Karsten Keil
2012-04-27 10:29 ` Tilman Schmidt
2012-04-28 9:29 ` Karsten Keil
2012-04-25 23:02 ` Tilman Schmidt [this message]
2012-04-25 23:02 ` [PATCH 6/8] isdn/gigaset: unify function return values Tilman Schmidt
2012-04-25 23:02 ` [PATCH 2/8] isdn/gigaset: fix CAPI disconnect B3 handling Tilman Schmidt
2012-04-25 23:02 ` [PATCH 7/8] isdn/capi: fix readability damage Tilman Schmidt
2012-04-25 23:02 ` [PATCH 8/8] isdn/capi: elliminate capincci_find() in non-middleware case Tilman Schmidt
2012-04-25 23:02 ` [PATCH 4/8] isdn/gigaset: fix readability damage Tilman Schmidt
2012-04-25 23:02 ` [PATCH 3/8] isdn/gigaset: improve error handling querying firmware version Tilman Schmidt
2012-05-08 0:24 ` [PATCH 0/8] ISDN patches for net-next Tilman Schmidt
2012-05-08 2:29 ` David Miller
2012-05-08 2:42 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120425-patch-gigaset-05.tilman@imap.cc \
--to=tilman@imap.cc \
--cc=davem@davemloft.net \
--cc=hjlipp@web.de \
--cc=i4ldeveloper@listserv.isdn4linux.de \
--cc=isdn@linux-pingi.de \
--cc=keil@b1-systems.de \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).