diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/isdn/hardware/eicon/dadapter.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc4s8s_l1.c | 4 | ||||
-rw-r--r-- | drivers/isdn/hysdn/hycapi.c | 20 | ||||
-rw-r--r-- | drivers/isdn/hysdn/hysdn_boot.c | 4 | ||||
-rw-r--r-- | drivers/isdn/hysdn/hysdn_defs.h | 12 | ||||
-rw-r--r-- | drivers/isdn/hysdn/hysdn_init.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hysdn/hysdn_proclog.c | 4 |
7 files changed, 20 insertions, 28 deletions
diff --git a/drivers/isdn/hardware/eicon/dadapter.c b/drivers/isdn/hardware/eicon/dadapter.c index 6e548a222ef1..89497890158d 100644 --- a/drivers/isdn/hardware/eicon/dadapter.c +++ b/drivers/isdn/hardware/eicon/dadapter.c | |||
@@ -44,7 +44,7 @@ static didd_adapter_change_notification_t\ | |||
44 | Array to held adapter information | 44 | Array to held adapter information |
45 | -------------------------------------------------------------------------- */ | 45 | -------------------------------------------------------------------------- */ |
46 | static DESCRIPTOR HandleTable[NEW_MAX_DESCRIPTORS]; | 46 | static DESCRIPTOR HandleTable[NEW_MAX_DESCRIPTORS]; |
47 | dword Adapters = 0; /* Number of adapters */ | 47 | static dword Adapters = 0; /* Number of adapters */ |
48 | /* -------------------------------------------------------------------------- | 48 | /* -------------------------------------------------------------------------- |
49 | Shadow IDI_DIMAINT | 49 | Shadow IDI_DIMAINT |
50 | and 'shadow' debug stuff | 50 | and 'shadow' debug stuff |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index 5cbcfa99fc6f..7333377ab31d 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
@@ -1465,7 +1465,7 @@ hfc_hardware_enable(hfc4s8s_hw * hw, int enable, int nt_mode) | |||
1465 | /******************************************/ | 1465 | /******************************************/ |
1466 | /* disable memory mapped ports / io ports */ | 1466 | /* disable memory mapped ports / io ports */ |
1467 | /******************************************/ | 1467 | /******************************************/ |
1468 | void | 1468 | static void |
1469 | release_pci_ports(hfc4s8s_hw * hw) | 1469 | release_pci_ports(hfc4s8s_hw * hw) |
1470 | { | 1470 | { |
1471 | pci_write_config_word(hw->pdev, PCI_COMMAND, 0); | 1471 | pci_write_config_word(hw->pdev, PCI_COMMAND, 0); |
@@ -1481,7 +1481,7 @@ release_pci_ports(hfc4s8s_hw * hw) | |||
1481 | /*****************************************/ | 1481 | /*****************************************/ |
1482 | /* enable memory mapped ports / io ports */ | 1482 | /* enable memory mapped ports / io ports */ |
1483 | /*****************************************/ | 1483 | /*****************************************/ |
1484 | void | 1484 | static void |
1485 | enable_pci_ports(hfc4s8s_hw * hw) | 1485 | enable_pci_ports(hfc4s8s_hw * hw) |
1486 | { | 1486 | { |
1487 | #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM | 1487 | #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM |
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index 8ee25b2ccce1..1fd3d4e5f284 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c | |||
@@ -42,6 +42,8 @@ typedef struct _hycapi_appl { | |||
42 | 42 | ||
43 | static hycapi_appl hycapi_applications[CAPI_MAXAPPL]; | 43 | static hycapi_appl hycapi_applications[CAPI_MAXAPPL]; |
44 | 44 | ||
45 | static u16 hycapi_send_message(struct capi_ctr *ctrl, struct sk_buff *skb); | ||
46 | |||
45 | static inline int _hycapi_appCheck(int app_id, int ctrl_no) | 47 | static inline int _hycapi_appCheck(int app_id, int ctrl_no) |
46 | { | 48 | { |
47 | if((ctrl_no <= 0) || (ctrl_no > CAPI_MAXCONTR) || (app_id <= 0) || | 49 | if((ctrl_no <= 0) || (ctrl_no > CAPI_MAXCONTR) || (app_id <= 0) || |
@@ -57,7 +59,7 @@ static inline int _hycapi_appCheck(int app_id, int ctrl_no) | |||
57 | Kernel-Capi callback reset_ctr | 59 | Kernel-Capi callback reset_ctr |
58 | ******************************/ | 60 | ******************************/ |
59 | 61 | ||
60 | void | 62 | static void |
61 | hycapi_reset_ctr(struct capi_ctr *ctrl) | 63 | hycapi_reset_ctr(struct capi_ctr *ctrl) |
62 | { | 64 | { |
63 | hycapictrl_info *cinfo = ctrl->driverdata; | 65 | hycapictrl_info *cinfo = ctrl->driverdata; |
@@ -73,7 +75,7 @@ hycapi_reset_ctr(struct capi_ctr *ctrl) | |||
73 | Kernel-Capi callback remove_ctr | 75 | Kernel-Capi callback remove_ctr |
74 | ******************************/ | 76 | ******************************/ |
75 | 77 | ||
76 | void | 78 | static void |
77 | hycapi_remove_ctr(struct capi_ctr *ctrl) | 79 | hycapi_remove_ctr(struct capi_ctr *ctrl) |
78 | { | 80 | { |
79 | int i; | 81 | int i; |
@@ -215,7 +217,7 @@ Error-checking is done for CAPI-compliance. | |||
215 | The application is recorded in the internal list. | 217 | The application is recorded in the internal list. |
216 | *************************************************************/ | 218 | *************************************************************/ |
217 | 219 | ||
218 | void | 220 | static void |
219 | hycapi_register_appl(struct capi_ctr *ctrl, __u16 appl, | 221 | hycapi_register_appl(struct capi_ctr *ctrl, __u16 appl, |
220 | capi_register_params *rp) | 222 | capi_register_params *rp) |
221 | { | 223 | { |
@@ -291,7 +293,7 @@ Release the application from the internal list an remove it's | |||
291 | registration at controller-level | 293 | registration at controller-level |
292 | ******************************************************************/ | 294 | ******************************************************************/ |
293 | 295 | ||
294 | void | 296 | static void |
295 | hycapi_release_appl(struct capi_ctr *ctrl, __u16 appl) | 297 | hycapi_release_appl(struct capi_ctr *ctrl, __u16 appl) |
296 | { | 298 | { |
297 | int chk; | 299 | int chk; |
@@ -364,7 +366,7 @@ firmware-releases that do not check the MsgLen-Indication! | |||
364 | 366 | ||
365 | ***************************************************************/ | 367 | ***************************************************************/ |
366 | 368 | ||
367 | u16 hycapi_send_message(struct capi_ctr *ctrl, struct sk_buff *skb) | 369 | static u16 hycapi_send_message(struct capi_ctr *ctrl, struct sk_buff *skb) |
368 | { | 370 | { |
369 | __u16 appl_id; | 371 | __u16 appl_id; |
370 | int _len, _len2; | 372 | int _len, _len2; |
@@ -437,8 +439,8 @@ Informations provided in the /proc/capi-entries. | |||
437 | 439 | ||
438 | *********************************************************************/ | 440 | *********************************************************************/ |
439 | 441 | ||
440 | int hycapi_read_proc(char *page, char **start, off_t off, | 442 | static int hycapi_read_proc(char *page, char **start, off_t off, |
441 | int count, int *eof, struct capi_ctr *ctrl) | 443 | int count, int *eof, struct capi_ctr *ctrl) |
442 | { | 444 | { |
443 | hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata); | 445 | hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata); |
444 | hysdn_card *card = cinfo->card; | 446 | hysdn_card *card = cinfo->card; |
@@ -485,7 +487,7 @@ on capi-interface registration. | |||
485 | 487 | ||
486 | **************************************************************/ | 488 | **************************************************************/ |
487 | 489 | ||
488 | int hycapi_load_firmware(struct capi_ctr *ctrl, capiloaddata *data) | 490 | static int hycapi_load_firmware(struct capi_ctr *ctrl, capiloaddata *data) |
489 | { | 491 | { |
490 | #ifdef HYCAPI_PRINTFNAMES | 492 | #ifdef HYCAPI_PRINTFNAMES |
491 | printk(KERN_NOTICE "hycapi_load_firmware\n"); | 493 | printk(KERN_NOTICE "hycapi_load_firmware\n"); |
@@ -494,7 +496,7 @@ int hycapi_load_firmware(struct capi_ctr *ctrl, capiloaddata *data) | |||
494 | } | 496 | } |
495 | 497 | ||
496 | 498 | ||
497 | char *hycapi_procinfo(struct capi_ctr *ctrl) | 499 | static char *hycapi_procinfo(struct capi_ctr *ctrl) |
498 | { | 500 | { |
499 | hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata); | 501 | hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata); |
500 | #ifdef HYCAPI_PRINTFNAMES | 502 | #ifdef HYCAPI_PRINTFNAMES |
diff --git a/drivers/isdn/hysdn/hysdn_boot.c b/drivers/isdn/hysdn/hysdn_boot.c index 6c04281e57b8..7bfba196f315 100644 --- a/drivers/isdn/hysdn/hysdn_boot.c +++ b/drivers/isdn/hysdn/hysdn_boot.c | |||
@@ -53,7 +53,7 @@ struct boot_data { | |||
53 | /* to be called at start of POF file reading, */ | 53 | /* to be called at start of POF file reading, */ |
54 | /* before starting any decryption on any POF record. */ | 54 | /* before starting any decryption on any POF record. */ |
55 | /*****************************************************/ | 55 | /*****************************************************/ |
56 | void | 56 | static void |
57 | StartDecryption(struct boot_data *boot) | 57 | StartDecryption(struct boot_data *boot) |
58 | { | 58 | { |
59 | boot->Cryptor = CRYPT_STARTTERM; | 59 | boot->Cryptor = CRYPT_STARTTERM; |
@@ -66,7 +66,7 @@ StartDecryption(struct boot_data *boot) | |||
66 | /* to HI and LO boot loader and (all) seq tags, because */ | 66 | /* to HI and LO boot loader and (all) seq tags, because */ |
67 | /* global Cryptor is started for whole POF. */ | 67 | /* global Cryptor is started for whole POF. */ |
68 | /***************************************************************/ | 68 | /***************************************************************/ |
69 | void | 69 | static void |
70 | DecryptBuf(struct boot_data *boot, int cnt) | 70 | DecryptBuf(struct boot_data *boot, int cnt) |
71 | { | 71 | { |
72 | uchar *bufp = boot->buf.BootBuf; | 72 | uchar *bufp = boot->buf.BootBuf; |
diff --git a/drivers/isdn/hysdn/hysdn_defs.h b/drivers/isdn/hysdn/hysdn_defs.h index 4cee26e558ee..432f6f99089e 100644 --- a/drivers/isdn/hysdn/hysdn_defs.h +++ b/drivers/isdn/hysdn/hysdn_defs.h | |||
@@ -227,7 +227,6 @@ typedef struct hycapictrl_info hycapictrl_info; | |||
227 | /*****************/ | 227 | /*****************/ |
228 | /* exported vars */ | 228 | /* exported vars */ |
229 | /*****************/ | 229 | /*****************/ |
230 | extern int cardmax; /* number of found cards */ | ||
231 | extern hysdn_card *card_root; /* pointer to first card */ | 230 | extern hysdn_card *card_root; /* pointer to first card */ |
232 | 231 | ||
233 | 232 | ||
@@ -244,7 +243,6 @@ extern void hysdn_procconf_release(void); /* deinit proc config filesys */ | |||
244 | /* hysdn_proclog.c */ | 243 | /* hysdn_proclog.c */ |
245 | extern int hysdn_proclog_init(hysdn_card *); /* init proc log entry */ | 244 | extern int hysdn_proclog_init(hysdn_card *); /* init proc log entry */ |
246 | extern void hysdn_proclog_release(hysdn_card *); /* deinit proc log entry */ | 245 | extern void hysdn_proclog_release(hysdn_card *); /* deinit proc log entry */ |
247 | extern void put_log_buffer(hysdn_card *, char *); /* output log data */ | ||
248 | extern void hysdn_addlog(hysdn_card *, char *,...); /* output data to log */ | 246 | extern void hysdn_addlog(hysdn_card *, char *,...); /* output data to log */ |
249 | extern void hysdn_card_errlog(hysdn_card *, tErrLogEntry *, int); /* output card log */ | 247 | extern void hysdn_card_errlog(hysdn_card *, tErrLogEntry *, int); /* output card log */ |
250 | 248 | ||
@@ -278,16 +276,6 @@ extern unsigned int hycapi_enable; | |||
278 | extern int hycapi_capi_create(hysdn_card *); /* create a new capi device */ | 276 | extern int hycapi_capi_create(hysdn_card *); /* create a new capi device */ |
279 | extern int hycapi_capi_release(hysdn_card *); /* delete the device */ | 277 | extern int hycapi_capi_release(hysdn_card *); /* delete the device */ |
280 | extern int hycapi_capi_stop(hysdn_card *card); /* suspend */ | 278 | extern int hycapi_capi_stop(hysdn_card *card); /* suspend */ |
281 | extern int hycapi_load_firmware(struct capi_ctr *, capiloaddata *); | ||
282 | extern void hycapi_reset_ctr(struct capi_ctr *); | ||
283 | extern void hycapi_remove_ctr(struct capi_ctr *); | ||
284 | extern void hycapi_register_appl(struct capi_ctr *, __u16 appl, | ||
285 | capi_register_params *); | ||
286 | extern void hycapi_release_appl(struct capi_ctr *, __u16 appl); | ||
287 | extern u16 hycapi_send_message(struct capi_ctr *, struct sk_buff *skb); | ||
288 | extern char *hycapi_procinfo(struct capi_ctr *); | ||
289 | extern int hycapi_read_proc(char *page, char **start, off_t off, | ||
290 | int count, int *eof, struct capi_ctr *card); | ||
291 | extern void hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len); | 279 | extern void hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len); |
292 | extern void hycapi_tx_capiack(hysdn_card * card); | 280 | extern void hycapi_tx_capiack(hysdn_card * card); |
293 | extern struct sk_buff *hycapi_tx_capiget(hysdn_card *card); | 281 | extern struct sk_buff *hycapi_tx_capiget(hysdn_card *card); |
diff --git a/drivers/isdn/hysdn/hysdn_init.c b/drivers/isdn/hysdn/hysdn_init.c index 5cac2bf5f4b0..12c8137b5161 100644 --- a/drivers/isdn/hysdn/hysdn_init.c +++ b/drivers/isdn/hysdn/hysdn_init.c | |||
@@ -34,7 +34,7 @@ MODULE_AUTHOR("Werner Cornelius"); | |||
34 | MODULE_LICENSE("GPL"); | 34 | MODULE_LICENSE("GPL"); |
35 | 35 | ||
36 | static char *hysdn_init_revision = "$Revision: 1.6.6.6 $"; | 36 | static char *hysdn_init_revision = "$Revision: 1.6.6.6 $"; |
37 | int cardmax; /* number of found cards */ | 37 | static int cardmax; /* number of found cards */ |
38 | hysdn_card *card_root = NULL; /* pointer to first card */ | 38 | hysdn_card *card_root = NULL; /* pointer to first card */ |
39 | 39 | ||
40 | /**********************************************/ | 40 | /**********************************************/ |
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c index 8ef2b7c952a6..4d57011c5737 100644 --- a/drivers/isdn/hysdn/hysdn_proclog.c +++ b/drivers/isdn/hysdn/hysdn_proclog.c | |||
@@ -22,6 +22,8 @@ | |||
22 | /* the proc subdir for the interface is defined in the procconf module */ | 22 | /* the proc subdir for the interface is defined in the procconf module */ |
23 | extern struct proc_dir_entry *hysdn_proc_entry; | 23 | extern struct proc_dir_entry *hysdn_proc_entry; |
24 | 24 | ||
25 | static void put_log_buffer(hysdn_card * card, char *cp); | ||
26 | |||
25 | /*************************************************/ | 27 | /*************************************************/ |
26 | /* structure keeping ascii log for device output */ | 28 | /* structure keeping ascii log for device output */ |
27 | /*************************************************/ | 29 | /*************************************************/ |
@@ -93,7 +95,7 @@ hysdn_addlog(hysdn_card * card, char *fmt,...) | |||
93 | /* opened for read got the contents. */ | 95 | /* opened for read got the contents. */ |
94 | /* Flushes buffers not longer in use. */ | 96 | /* Flushes buffers not longer in use. */ |
95 | /********************************************/ | 97 | /********************************************/ |
96 | void | 98 | static void |
97 | put_log_buffer(hysdn_card * card, char *cp) | 99 | put_log_buffer(hysdn_card * card, char *cp) |
98 | { | 100 | { |
99 | struct log_data *ib; | 101 | struct log_data *ib; |