Commit 3e206b0a authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

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



This patch contains the following possible cleanups:
- make needlessly global code static
- remove the following unused global function:
  - isdn_audio.c: isdn_audio_2adpcm_flush
- remove the following unused struct:
  - isdn_net.c: isdn_concap_demand_dial_dops

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 886cca3a

drivers/isdn/i4l/isdn_audio.c

+0 −10
Original line number Diff line number Diff line
@@ -391,16 +391,6 @@ isdn_audio_adpcm2xlaw(adpcm_state * s, int fmt, unsigned char *in, 
	return olen;

}



int

isdn_audio_2adpcm_flush(adpcm_state * s, unsigned char *out)

{

	int olen = 0;



	if (s->nleft)

		isdn_audio_put_bits(0, 8 - s->nleft, s, &out, &olen);

	return olen;

}



int

isdn_audio_xlaw2adpcm(adpcm_state * s, int fmt, unsigned char *in,

		      unsigned char *out, int len)

drivers/isdn/i4l/isdn_audio.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ extern void isdn_audio_alaw2ulaw(unsigned char *, unsigned long); 
extern adpcm_state *isdn_audio_adpcm_init(adpcm_state *, int);

extern int isdn_audio_adpcm2xlaw(adpcm_state *, int, unsigned char *, unsigned char *, int);

extern int isdn_audio_xlaw2adpcm(adpcm_state *, int, unsigned char *, unsigned char *, int);

extern int isdn_audio_2adpcm_flush(adpcm_state * s, unsigned char *out);

extern void isdn_audio_calc_dtmf(modem_info *, unsigned char *, int, int);

extern void isdn_audio_eval_dtmf(modem_info *);

dtmf_state *isdn_audio_dtmf_init(dtmf_state *);

drivers/isdn/i4l/isdn_common.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static isdn_divert_if *divert_if; /* = NULL */ 
static int isdn_writebuf_stub(int, int, const u_char __user *, int);

static void set_global_features(void);

static int isdn_wildmat(char *s, char *p);



static int isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding);



static inline void

isdn_lock_driver(isdn_driver_t *drv)
@@ -388,7 +388,7 @@ isdn_all_eaz(int di, int ch) 
 */

#include <linux/isdn/capicmd.h>



int

static int

isdn_capi_rec_hl_msg(capi_msg *cm) {

	

	int di;
@@ -1923,7 +1923,7 @@ isdn_writebuf_skb_stub(int drvidx, int chan, int ack, struct sk_buff *skb) 
	return ret;

}



int

static int

isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding)

{

	int j, k, m;

drivers/isdn/i4l/isdn_common.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ extern int isdn_get_free_channel(int, int, int, int, int, char *); 
extern int  isdn_writebuf_skb_stub(int, int, int, struct sk_buff *);

extern int  register_isdn(isdn_if * i);

extern int  isdn_msncmp( const char *,  const char *);

extern int  isdn_add_channels(isdn_driver_t *, int, int, int);

#if defined(ISDN_DEBUG_NET_DUMP) || defined(ISDN_DEBUG_MODEM_DUMP)

extern void isdn_dumppkt(char *, u_char *, int, int);

#endif

drivers/isdn/i4l/isdn_concap.c

+3 −12
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
   */





int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb)

static int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb)

{

	struct net_device *ndev = concap -> net_dev;

	isdn_net_dev *nd = ((isdn_net_local *) ndev->priv)->netdev;
@@ -58,7 +58,7 @@ int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb) 
}





int isdn_concap_dl_connect_req(struct concap_proto *concap)

static int isdn_concap_dl_connect_req(struct concap_proto *concap)

{

	struct net_device *ndev = concap -> net_dev;

	isdn_net_local *lp = (isdn_net_local *) ndev->priv;
@@ -71,7 +71,7 @@ int isdn_concap_dl_connect_req(struct concap_proto *concap) 
	return ret;

}



int isdn_concap_dl_disconn_req(struct concap_proto *concap)

static int isdn_concap_dl_disconn_req(struct concap_proto *concap)

{

	IX25DEBUG( "isdn_concap_dl_disconn_req: %s \n", concap -> net_dev -> name);
@@ -85,15 +85,6 @@ struct concap_device_ops isdn_concap_reliable_dl_dops = { 
	&isdn_concap_dl_disconn_req

};



struct concap_device_ops isdn_concap_demand_dial_dops = {

	NULL, /* set this first entry to something like &isdn_net_start_xmit,

		 but the entry part of the current isdn_net_start_xmit must be

		 separated first. */

	/* no connection control for demand dial semantics */

	NULL,

	NULL,

};



/* The following should better go into a dedicated source file such that

   this sourcefile does not need to include any protocol specific header

   files. For now: