From: Adrian Bunk <bunk@stusta.de>
To: kkeil@suse.de, kai.germaschewski@gmx.de
Cc: isdn4linux@listserv.isdn4linux.de, linux-kernel@vger.kernel.org
Subject: [2.6 patch] drivers/isdn/pcbit/: possible cleanups
Date: Wed, 9 Feb 2005 03:55:21 +0100 [thread overview]
Message-ID: <20050209025521.GD2978@stusta.de> (raw)
This patch contains the following possible cleanups:
- make some needlessly global functions static
- remove the following unused global functions:
- callbacks.c: cb_out_3
- capi.c: capi_decode_disc_conf
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
drivers/isdn/pcbit/callbacks.c | 17 -----------------
drivers/isdn/pcbit/callbacks.h | 3 ---
drivers/isdn/pcbit/capi.c | 10 ----------
drivers/isdn/pcbit/capi.h | 1 -
drivers/isdn/pcbit/drv.c | 16 ++++++++--------
5 files changed, 8 insertions(+), 39 deletions(-)
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/callbacks.h.old 2005-02-09 03:27:18.000000000 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/callbacks.h 2005-02-09 03:27:24.000000000 +0100
@@ -19,9 +19,6 @@
extern void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan,
struct callb_data *data);
-extern void cb_out_3(struct pcbit_dev * dev, struct pcbit_chan* chan,
- struct callb_data *data);
-
extern void cb_in_1(struct pcbit_dev * dev, struct pcbit_chan* chan,
struct callb_data *data);
extern void cb_in_2(struct pcbit_dev * dev, struct pcbit_chan* chan,
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/callbacks.c.old 2005-02-09 03:27:32.000000000 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/callbacks.c 2005-02-09 03:27:49.000000000 +0100
@@ -125,23 +125,6 @@
/*
- * Disconnect received (actually RELEASE COMPLETE)
- * This means we were not able to establish connection with remote
- * Inform the big boss above
- */
-void cb_out_3(struct pcbit_dev * dev, struct pcbit_chan* chan,
- struct callb_data *data)
-{
- isdn_ctrl ictl;
-
- ictl.command = ISDN_STAT_DHUP;
- ictl.driver=dev->id;
- ictl.arg=chan->id;
- dev->dev_if->statcallb(&ictl);
-}
-
-
-/*
* Incoming call received
* inform user
*/
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/capi.h.old 2005-02-09 03:28:06.000000000 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/capi.h 2005-02-09 03:28:14.000000000 +0100
@@ -54,7 +54,6 @@
/* Connection Termination */
extern int capi_disc_req(ushort callref, struct sk_buff **skb, u_char cause);
-extern int capi_decode_disc_conf(struct pcbit_chan *chan, struct sk_buff *skb);
extern int capi_decode_disc_ind(struct pcbit_chan *chan, struct sk_buff *skb);
extern int capi_disc_resp(struct pcbit_chan *chan, struct sk_buff **skb);
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/capi.c.old 2005-02-09 03:28:26.000000000 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/capi.c 2005-02-09 03:28:32.000000000 +0100
@@ -627,16 +627,6 @@
return 0;
}
-int capi_decode_disc_conf(struct pcbit_chan *chan, struct sk_buff *skb)
-{
- ushort errcode;
-
- errcode = *((ushort*) skb->data);
- skb_pull(skb, 2);
-
- return errcode;
-}
-
#ifdef DEBUG
int capi_decode_debug_188(u_char *hdr, ushort hdrlen)
{
--- linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/drv.c.old 2005-02-09 03:29:07.000000000 +0100
+++ linux-2.6.11-rc3-mm1-full/drivers/isdn/pcbit/drv.c 2005-02-09 03:30:10.000000000 +0100
@@ -56,10 +56,10 @@
* prototypes
*/
-int pcbit_command(isdn_ctrl* ctl);
-int pcbit_stat(u_char __user * buf, int len, int, int);
-int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb);
-int pcbit_writecmd(const u_char __user *, int, int, int);
+static int pcbit_command(isdn_ctrl* ctl);
+static int pcbit_stat(u_char __user * buf, int len, int, int);
+static int pcbit_xmit(int driver, int chan, int ack, struct sk_buff *skb);
+static int pcbit_writecmd(const u_char __user *, int, int, int);
static int set_protocol_running(struct pcbit_dev * dev);
@@ -238,7 +238,7 @@
}
#endif
-int pcbit_command(isdn_ctrl* ctl)
+static int pcbit_command(isdn_ctrl* ctl)
{
struct pcbit_dev *dev;
struct pcbit_chan *chan;
@@ -330,7 +330,7 @@
}
#endif
-int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
+static int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb)
{
ushort hdrlen;
int refnum, len;
@@ -389,7 +389,7 @@
return len;
}
-int pcbit_writecmd(const u_char __user *buf, int len, int driver, int channel)
+static int pcbit_writecmd(const u_char __user *buf, int len, int driver, int channel)
{
struct pcbit_dev * dev;
int i, j;
@@ -713,7 +713,7 @@
static int stat_st = 0;
static int stat_end = 0;
-int pcbit_stat(u_char __user *buf, int len, int driver, int channel)
+static int pcbit_stat(u_char __user *buf, int len, int driver, int channel)
{
int stat_count;
stat_count = stat_end - stat_st;
next reply other threads:[~2005-02-09 2:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-09 2:55 Adrian Bunk [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-03-13 3:54 [2.6 patch] drivers/isdn/pcbit/: possible cleanups Adrian Bunk
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=20050209025521.GD2978@stusta.de \
--to=bunk@stusta.de \
--cc=isdn4linux@listserv.isdn4linux.de \
--cc=kai.germaschewski@gmx.de \
--cc=kkeil@suse.de \
--cc=linux-kernel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.