Commit aade0e82 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

[PATCH] drivers/isdn/: make some code static

This patch makes some needlessly global code static.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarArmin Schindler <armin@melware.de>
Signed-off-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 687a21ce
...@@ -44,7 +44,7 @@ static didd_adapter_change_notification_t\ ...@@ -44,7 +44,7 @@ static didd_adapter_change_notification_t\
Array to held adapter information Array to held adapter information
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
static DESCRIPTOR HandleTable[NEW_MAX_DESCRIPTORS]; static DESCRIPTOR HandleTable[NEW_MAX_DESCRIPTORS];
dword Adapters = 0; /* Number of adapters */ static dword Adapters = 0; /* Number of adapters */
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Shadow IDI_DIMAINT Shadow IDI_DIMAINT
and 'shadow' debug stuff and 'shadow' debug stuff
......
...@@ -1465,7 +1465,7 @@ hfc_hardware_enable(hfc4s8s_hw * hw, int enable, int nt_mode) ...@@ -1465,7 +1465,7 @@ hfc_hardware_enable(hfc4s8s_hw * hw, int enable, int nt_mode)
/******************************************/ /******************************************/
/* disable memory mapped ports / io ports */ /* disable memory mapped ports / io ports */
/******************************************/ /******************************************/
void static void
release_pci_ports(hfc4s8s_hw * hw) release_pci_ports(hfc4s8s_hw * hw)
{ {
pci_write_config_word(hw->pdev, PCI_COMMAND, 0); pci_write_config_word(hw->pdev, PCI_COMMAND, 0);
...@@ -1481,7 +1481,7 @@ release_pci_ports(hfc4s8s_hw * hw) ...@@ -1481,7 +1481,7 @@ release_pci_ports(hfc4s8s_hw * hw)
/*****************************************/ /*****************************************/
/* enable memory mapped ports / io ports */ /* enable memory mapped ports / io ports */
/*****************************************/ /*****************************************/
void static void
enable_pci_ports(hfc4s8s_hw * hw) enable_pci_ports(hfc4s8s_hw * hw)
{ {
#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM #ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
......
...@@ -42,6 +42,8 @@ typedef struct _hycapi_appl { ...@@ -42,6 +42,8 @@ typedef struct _hycapi_appl {
static hycapi_appl hycapi_applications[CAPI_MAXAPPL]; static hycapi_appl hycapi_applications[CAPI_MAXAPPL];
static u16 hycapi_send_message(struct capi_ctr *ctrl, struct sk_buff *skb);
static inline int _hycapi_appCheck(int app_id, int ctrl_no) static inline int _hycapi_appCheck(int app_id, int ctrl_no)
{ {
if((ctrl_no <= 0) || (ctrl_no > CAPI_MAXCONTR) || (app_id <= 0) || 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,7 +59,7 @@ static inline int _hycapi_appCheck(int app_id, int ctrl_no)
Kernel-Capi callback reset_ctr Kernel-Capi callback reset_ctr
******************************/ ******************************/
void static void
hycapi_reset_ctr(struct capi_ctr *ctrl) hycapi_reset_ctr(struct capi_ctr *ctrl)
{ {
hycapictrl_info *cinfo = ctrl->driverdata; hycapictrl_info *cinfo = ctrl->driverdata;
...@@ -73,7 +75,7 @@ hycapi_reset_ctr(struct capi_ctr *ctrl) ...@@ -73,7 +75,7 @@ hycapi_reset_ctr(struct capi_ctr *ctrl)
Kernel-Capi callback remove_ctr Kernel-Capi callback remove_ctr
******************************/ ******************************/
void static void
hycapi_remove_ctr(struct capi_ctr *ctrl) hycapi_remove_ctr(struct capi_ctr *ctrl)
{ {
int i; int i;
...@@ -215,7 +217,7 @@ Error-checking is done for CAPI-compliance. ...@@ -215,7 +217,7 @@ Error-checking is done for CAPI-compliance.
The application is recorded in the internal list. The application is recorded in the internal list.
*************************************************************/ *************************************************************/
void static void
hycapi_register_appl(struct capi_ctr *ctrl, __u16 appl, hycapi_register_appl(struct capi_ctr *ctrl, __u16 appl,
capi_register_params *rp) capi_register_params *rp)
{ {
...@@ -291,7 +293,7 @@ Release the application from the internal list an remove it's ...@@ -291,7 +293,7 @@ Release the application from the internal list an remove it's
registration at controller-level registration at controller-level
******************************************************************/ ******************************************************************/
void static void
hycapi_release_appl(struct capi_ctr *ctrl, __u16 appl) hycapi_release_appl(struct capi_ctr *ctrl, __u16 appl)
{ {
int chk; int chk;
...@@ -364,7 +366,7 @@ firmware-releases that do not check the MsgLen-Indication! ...@@ -364,7 +366,7 @@ firmware-releases that do not check the MsgLen-Indication!
***************************************************************/ ***************************************************************/
u16 hycapi_send_message(struct capi_ctr *ctrl, struct sk_buff *skb) static u16 hycapi_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
{ {
__u16 appl_id; __u16 appl_id;
int _len, _len2; int _len, _len2;
...@@ -437,7 +439,7 @@ Informations provided in the /proc/capi-entries. ...@@ -437,7 +439,7 @@ Informations provided in the /proc/capi-entries.
*********************************************************************/ *********************************************************************/
int hycapi_read_proc(char *page, char **start, off_t off, static int hycapi_read_proc(char *page, char **start, off_t off,
int count, int *eof, struct capi_ctr *ctrl) int count, int *eof, struct capi_ctr *ctrl)
{ {
hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata); hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata);
...@@ -485,7 +487,7 @@ on capi-interface registration. ...@@ -485,7 +487,7 @@ on capi-interface registration.
**************************************************************/ **************************************************************/
int hycapi_load_firmware(struct capi_ctr *ctrl, capiloaddata *data) static int hycapi_load_firmware(struct capi_ctr *ctrl, capiloaddata *data)
{ {
#ifdef HYCAPI_PRINTFNAMES #ifdef HYCAPI_PRINTFNAMES
printk(KERN_NOTICE "hycapi_load_firmware\n"); printk(KERN_NOTICE "hycapi_load_firmware\n");
...@@ -494,7 +496,7 @@ int hycapi_load_firmware(struct capi_ctr *ctrl, capiloaddata *data) ...@@ -494,7 +496,7 @@ int hycapi_load_firmware(struct capi_ctr *ctrl, capiloaddata *data)
} }
char *hycapi_procinfo(struct capi_ctr *ctrl) static char *hycapi_procinfo(struct capi_ctr *ctrl)
{ {
hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata); hycapictrl_info *cinfo = (hycapictrl_info *)(ctrl->driverdata);
#ifdef HYCAPI_PRINTFNAMES #ifdef HYCAPI_PRINTFNAMES
......
...@@ -53,7 +53,7 @@ struct boot_data { ...@@ -53,7 +53,7 @@ struct boot_data {
/* to be called at start of POF file reading, */ /* to be called at start of POF file reading, */
/* before starting any decryption on any POF record. */ /* before starting any decryption on any POF record. */
/*****************************************************/ /*****************************************************/
void static void
StartDecryption(struct boot_data *boot) StartDecryption(struct boot_data *boot)
{ {
boot->Cryptor = CRYPT_STARTTERM; boot->Cryptor = CRYPT_STARTTERM;
...@@ -66,7 +66,7 @@ StartDecryption(struct boot_data *boot) ...@@ -66,7 +66,7 @@ StartDecryption(struct boot_data *boot)
/* to HI and LO boot loader and (all) seq tags, because */ /* to HI and LO boot loader and (all) seq tags, because */
/* global Cryptor is started for whole POF. */ /* global Cryptor is started for whole POF. */
/***************************************************************/ /***************************************************************/
void static void
DecryptBuf(struct boot_data *boot, int cnt) DecryptBuf(struct boot_data *boot, int cnt)
{ {
uchar *bufp = boot->buf.BootBuf; uchar *bufp = boot->buf.BootBuf;
......
...@@ -227,7 +227,6 @@ typedef struct hycapictrl_info hycapictrl_info; ...@@ -227,7 +227,6 @@ typedef struct hycapictrl_info hycapictrl_info;
/*****************/ /*****************/
/* exported vars */ /* exported vars */
/*****************/ /*****************/
extern int cardmax; /* number of found cards */
extern hysdn_card *card_root; /* pointer to first card */ extern hysdn_card *card_root; /* pointer to first card */
...@@ -244,7 +243,6 @@ extern void hysdn_procconf_release(void); /* deinit proc config filesys */ ...@@ -244,7 +243,6 @@ extern void hysdn_procconf_release(void); /* deinit proc config filesys */
/* hysdn_proclog.c */ /* hysdn_proclog.c */
extern int hysdn_proclog_init(hysdn_card *); /* init proc log entry */ extern int hysdn_proclog_init(hysdn_card *); /* init proc log entry */
extern void hysdn_proclog_release(hysdn_card *); /* deinit proc log entry */ extern void hysdn_proclog_release(hysdn_card *); /* deinit proc log entry */
extern void put_log_buffer(hysdn_card *, char *); /* output log data */
extern void hysdn_addlog(hysdn_card *, char *,...); /* output data to log */ extern void hysdn_addlog(hysdn_card *, char *,...); /* output data to log */
extern void hysdn_card_errlog(hysdn_card *, tErrLogEntry *, int); /* output card log */ extern void hysdn_card_errlog(hysdn_card *, tErrLogEntry *, int); /* output card log */
...@@ -278,16 +276,6 @@ extern unsigned int hycapi_enable; ...@@ -278,16 +276,6 @@ extern unsigned int hycapi_enable;
extern int hycapi_capi_create(hysdn_card *); /* create a new capi device */ extern int hycapi_capi_create(hysdn_card *); /* create a new capi device */
extern int hycapi_capi_release(hysdn_card *); /* delete the device */ extern int hycapi_capi_release(hysdn_card *); /* delete the device */
extern int hycapi_capi_stop(hysdn_card *card); /* suspend */ extern int hycapi_capi_stop(hysdn_card *card); /* suspend */
extern int hycapi_load_firmware(struct capi_ctr *, capiloaddata *);
extern void hycapi_reset_ctr(struct capi_ctr *);
extern void hycapi_remove_ctr(struct capi_ctr *);
extern void hycapi_register_appl(struct capi_ctr *, __u16 appl,
capi_register_params *);
extern void hycapi_release_appl(struct capi_ctr *, __u16 appl);
extern u16 hycapi_send_message(struct capi_ctr *, struct sk_buff *skb);
extern char *hycapi_procinfo(struct capi_ctr *);
extern int hycapi_read_proc(char *page, char **start, off_t off,
int count, int *eof, struct capi_ctr *card);
extern void hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len); extern void hycapi_rx_capipkt(hysdn_card * card, uchar * buf, word len);
extern void hycapi_tx_capiack(hysdn_card * card); extern void hycapi_tx_capiack(hysdn_card * card);
extern struct sk_buff *hycapi_tx_capiget(hysdn_card *card); extern struct sk_buff *hycapi_tx_capiget(hysdn_card *card);
......
...@@ -34,7 +34,7 @@ MODULE_AUTHOR("Werner Cornelius"); ...@@ -34,7 +34,7 @@ MODULE_AUTHOR("Werner Cornelius");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static char *hysdn_init_revision = "$Revision: 1.6.6.6 $"; static char *hysdn_init_revision = "$Revision: 1.6.6.6 $";
int cardmax; /* number of found cards */ static int cardmax; /* number of found cards */
hysdn_card *card_root = NULL; /* pointer to first card */ hysdn_card *card_root = NULL; /* pointer to first card */
/**********************************************/ /**********************************************/
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
/* the proc subdir for the interface is defined in the procconf module */ /* the proc subdir for the interface is defined in the procconf module */
extern struct proc_dir_entry *hysdn_proc_entry; extern struct proc_dir_entry *hysdn_proc_entry;
static void put_log_buffer(hysdn_card * card, char *cp);
/*************************************************/ /*************************************************/
/* structure keeping ascii log for device output */ /* structure keeping ascii log for device output */
/*************************************************/ /*************************************************/
...@@ -93,7 +95,7 @@ hysdn_addlog(hysdn_card * card, char *fmt,...) ...@@ -93,7 +95,7 @@ hysdn_addlog(hysdn_card * card, char *fmt,...)
/* opened for read got the contents. */ /* opened for read got the contents. */
/* Flushes buffers not longer in use. */ /* Flushes buffers not longer in use. */
/********************************************/ /********************************************/
void static void
put_log_buffer(hysdn_card * card, char *cp) put_log_buffer(hysdn_card * card, char *cp)
{ {
struct log_data *ib; struct log_data *ib;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment