Commit 886cca3a authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] drivers/isdn/pcbit/: possible cleanups 



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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e3ca5e76

drivers/isdn/pcbit/callbacks.c

+0 −17
Original line number Diff line number Diff line
@@ -124,23 +124,6 @@ void cb_out_2(struct pcbit_dev * dev, struct pcbit_chan* chan, 
}





/*

 * 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

drivers/isdn/pcbit/callbacks.h

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ extern void cb_out_1(struct pcbit_dev * dev, struct pcbit_chan* chan, 
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,

drivers/isdn/pcbit/capi.c

+0 −10
Original line number Diff line number Diff line
@@ -627,16 +627,6 @@ int capi_decode_disc_ind(struct pcbit_chan *chan, struct sk_buff *skb) 
        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)

{

drivers/isdn/pcbit/capi.h

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ extern int capi_tdata_resp(struct pcbit_chan *chan, struct sk_buff ** skb); 


/* 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);

drivers/isdn/pcbit/drv.c

+8 −8
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ static char* pcbit_devname[MAX_PCBIT_CARDS] = { 
 * 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 @@ void pcbit_terminate(int board) 
}

#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 @@ static void pcbit_block_timer(unsigned long data) 
}

#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 @@ int pcbit_xmit(int driver, int chnum, int ack, struct sk_buff *skb) 
	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 char statbuf[STATBUF_LEN]; 
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;