diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-06-25 17:58:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:24:56 -0400 |
commit | 3e206b0a66fcaf39dbef92640ce6a63d51fc5c53 (patch) | |
tree | 27e2941e1339be892b824434c24af518efd52294 /drivers/isdn/i4l/isdn_x25iface.c | |
parent | 886cca3a0fda659e17c730c20929134014ebe1f2 (diff) |
[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: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/i4l/isdn_x25iface.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_x25iface.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c index 4ab7600cf9c1..edf14a2aa3c8 100644 --- a/drivers/isdn/i4l/isdn_x25iface.c +++ b/drivers/isdn/i4l/isdn_x25iface.c | |||
@@ -40,15 +40,15 @@ typedef struct isdn_x25iface_proto_data { | |||
40 | 40 | ||
41 | 41 | ||
42 | /* is now in header file (extern): struct concap_proto * isdn_x25iface_proto_new(void); */ | 42 | /* is now in header file (extern): struct concap_proto * isdn_x25iface_proto_new(void); */ |
43 | void isdn_x25iface_proto_del( struct concap_proto * ); | 43 | static void isdn_x25iface_proto_del( struct concap_proto * ); |
44 | int isdn_x25iface_proto_close( struct concap_proto * ); | 44 | static int isdn_x25iface_proto_close( struct concap_proto * ); |
45 | int isdn_x25iface_proto_restart( struct concap_proto *, | 45 | static int isdn_x25iface_proto_restart( struct concap_proto *, |
46 | struct net_device *, | 46 | struct net_device *, |
47 | struct concap_device_ops *); | 47 | struct concap_device_ops *); |
48 | int isdn_x25iface_xmit( struct concap_proto *, struct sk_buff * ); | 48 | static int isdn_x25iface_xmit( struct concap_proto *, struct sk_buff * ); |
49 | int isdn_x25iface_receive( struct concap_proto *, struct sk_buff * ); | 49 | static int isdn_x25iface_receive( struct concap_proto *, struct sk_buff * ); |
50 | int isdn_x25iface_connect_ind( struct concap_proto * ); | 50 | static int isdn_x25iface_connect_ind( struct concap_proto * ); |
51 | int isdn_x25iface_disconn_ind( struct concap_proto * ); | 51 | static int isdn_x25iface_disconn_ind( struct concap_proto * ); |
52 | 52 | ||
53 | 53 | ||
54 | static struct concap_proto_ops ix25_pops = { | 54 | static struct concap_proto_ops ix25_pops = { |
@@ -102,7 +102,7 @@ struct concap_proto * isdn_x25iface_proto_new(void) | |||
102 | 102 | ||
103 | /* close the x25iface encapsulation protocol | 103 | /* close the x25iface encapsulation protocol |
104 | */ | 104 | */ |
105 | int isdn_x25iface_proto_close(struct concap_proto *cprot){ | 105 | static int isdn_x25iface_proto_close(struct concap_proto *cprot){ |
106 | 106 | ||
107 | ix25_pdata_t *tmp; | 107 | ix25_pdata_t *tmp; |
108 | int ret = 0; | 108 | int ret = 0; |
@@ -129,7 +129,7 @@ int isdn_x25iface_proto_close(struct concap_proto *cprot){ | |||
129 | 129 | ||
130 | /* Delete the x25iface encapsulation protocol instance | 130 | /* Delete the x25iface encapsulation protocol instance |
131 | */ | 131 | */ |
132 | void isdn_x25iface_proto_del(struct concap_proto *cprot){ | 132 | static void isdn_x25iface_proto_del(struct concap_proto *cprot){ |
133 | 133 | ||
134 | ix25_pdata_t * tmp; | 134 | ix25_pdata_t * tmp; |
135 | 135 | ||
@@ -158,9 +158,9 @@ void isdn_x25iface_proto_del(struct concap_proto *cprot){ | |||
158 | 158 | ||
159 | /* (re-)initialize the data structures for x25iface encapsulation | 159 | /* (re-)initialize the data structures for x25iface encapsulation |
160 | */ | 160 | */ |
161 | int isdn_x25iface_proto_restart(struct concap_proto *cprot, | 161 | static int isdn_x25iface_proto_restart(struct concap_proto *cprot, |
162 | struct net_device *ndev, | 162 | struct net_device *ndev, |
163 | struct concap_device_ops *dops) | 163 | struct concap_device_ops *dops) |
164 | { | 164 | { |
165 | ix25_pdata_t * pda = cprot -> proto_data ; | 165 | ix25_pdata_t * pda = cprot -> proto_data ; |
166 | ulong flags; | 166 | ulong flags; |
@@ -187,7 +187,7 @@ int isdn_x25iface_proto_restart(struct concap_proto *cprot, | |||
187 | 187 | ||
188 | /* deliver a dl_data frame received from i4l HL driver to the network layer | 188 | /* deliver a dl_data frame received from i4l HL driver to the network layer |
189 | */ | 189 | */ |
190 | int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb) | 190 | static int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb) |
191 | { | 191 | { |
192 | IX25DEBUG( "isdn_x25iface_receive %s \n", MY_DEVNAME(cprot->net_dev) ); | 192 | IX25DEBUG( "isdn_x25iface_receive %s \n", MY_DEVNAME(cprot->net_dev) ); |
193 | if ( ( (ix25_pdata_t*) (cprot->proto_data) ) | 193 | if ( ( (ix25_pdata_t*) (cprot->proto_data) ) |
@@ -206,7 +206,7 @@ int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb) | |||
206 | 206 | ||
207 | /* a connection set up is indicated by lower layer | 207 | /* a connection set up is indicated by lower layer |
208 | */ | 208 | */ |
209 | int isdn_x25iface_connect_ind(struct concap_proto *cprot) | 209 | static int isdn_x25iface_connect_ind(struct concap_proto *cprot) |
210 | { | 210 | { |
211 | struct sk_buff * skb = dev_alloc_skb(1); | 211 | struct sk_buff * skb = dev_alloc_skb(1); |
212 | enum wan_states *state_p | 212 | enum wan_states *state_p |
@@ -235,7 +235,7 @@ int isdn_x25iface_connect_ind(struct concap_proto *cprot) | |||
235 | 235 | ||
236 | /* a disconnect is indicated by lower layer | 236 | /* a disconnect is indicated by lower layer |
237 | */ | 237 | */ |
238 | int isdn_x25iface_disconn_ind(struct concap_proto *cprot) | 238 | static int isdn_x25iface_disconn_ind(struct concap_proto *cprot) |
239 | { | 239 | { |
240 | struct sk_buff *skb; | 240 | struct sk_buff *skb; |
241 | enum wan_states *state_p | 241 | enum wan_states *state_p |
@@ -264,7 +264,7 @@ int isdn_x25iface_disconn_ind(struct concap_proto *cprot) | |||
264 | /* process a frame handed over to us from linux network layer. First byte | 264 | /* process a frame handed over to us from linux network layer. First byte |
265 | semantics as defined in Documentation/networking/x25-iface.txt | 265 | semantics as defined in Documentation/networking/x25-iface.txt |
266 | */ | 266 | */ |
267 | int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb) | 267 | static int isdn_x25iface_xmit(struct concap_proto *cprot, struct sk_buff *skb) |
268 | { | 268 | { |
269 | unsigned char firstbyte = skb->data[0]; | 269 | unsigned char firstbyte = skb->data[0]; |
270 | enum wan_states *state = &((ix25_pdata_t*)cprot->proto_data)->state; | 270 | enum wan_states *state = &((ix25_pdata_t*)cprot->proto_data)->state; |