drivers/isdn/hisax/: possible cleanups
PATCH 1/1 drivers/isdn/hisax/: possible cleanups
This patch contains the following possible cleanups:
- make needlessly global code static
- remove the compiled but unused st5481_hdlc.{c,h}
- kill enternow.h
- enternow_pci.c: kill InByte/OutByte/BYTE
- isdnl2.c: kill FreeSkb
- remove or #if 0 the following unused functions:
- config.c: IsdnCardState
- ipacx.c: ipacx_new_ph
- ipacx.c: dch_bh
- ipacx.c: setup_ipacx
- isdnl2.c: IsRR
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/isdn/hisax/Makefile | 2 drivers/isdn/hisax/amd7930_fn.c | 8 drivers/isdn/hisax/asuscom.c | 4 drivers/isdn/hisax/avm_pci.c | 18 drivers/isdn/hisax/bkm_a4t.c | 4 drivers/isdn/hisax/bkm_a8.c | 6 drivers/isdn/hisax/callc.c | 6 drivers/isdn/hisax/config.c | 14 drivers/isdn/hisax/diva.c | 4 drivers/isdn/hisax/elsa.c | 8 drivers/isdn/hisax/elsa_ser.c | 20 - drivers/isdn/hisax/enternow.h | 51 -- drivers/isdn/hisax/enternow_pci.c | 91 ++-- drivers/isdn/hisax/gazel.c | 5 drivers/isdn/hisax/hfc4s8s_l1.c | 2 drivers/isdn/hisax/hfc_2bds0.c | 12 drivers/isdn/hisax/hfc_2bs0.c | 12 drivers/isdn/hisax/hfc_pci.c | 12 drivers/isdn/hisax/hfc_pci.h | 1 drivers/isdn/hisax/hfc_sx.c | 10 drivers/isdn/hisax/hfc_sx.h | 1 drivers/isdn/hisax/hfc_usb.c | 6 drivers/isdn/hisax/hfc_usb.h | 4 drivers/isdn/hisax/hfcscard.c | 2 drivers/isdn/hisax/hisax.h | 5 drivers/isdn/hisax/hscx.c | 4 drivers/isdn/hisax/icc.c | 6 drivers/isdn/hisax/ipacx.c | 86 ---- drivers/isdn/hisax/isac.c | 6 drivers/isdn/hisax/isar.c | 46 +- drivers/isdn/hisax/isdnl1.c | 8 drivers/isdn/hisax/isdnl2.c | 100 ++--- drivers/isdn/hisax/isdnl3.c | 2 drivers/isdn/hisax/isurf.c | 2 drivers/isdn/hisax/ix1_micro.c | 4 drivers/isdn/hisax/jade.c | 6 drivers/isdn/hisax/jade.h | 1 drivers/isdn/hisax/l3_1tr6.c | 2 drivers/isdn/hisax/l3dss1.c | 2 drivers/isdn/hisax/l3ni1.c | 4 drivers/isdn/hisax/mic.c | 4 drivers/isdn/hisax/netjet.c | 12 drivers/isdn/hisax/niccy.c | 4 drivers/isdn/hisax/nj_s.c | 2 drivers/isdn/hisax/nj_u.c | 2 drivers/isdn/hisax/q931.c | 4 drivers/isdn/hisax/s0box.c | 4 drivers/isdn/hisax/saphir.c | 2 drivers/isdn/hisax/sedlbauer.c | 6 drivers/isdn/hisax/sportster.c | 6 drivers/isdn/hisax/st5481.h | 4 drivers/isdn/hisax/st5481_hdlc.c | 580 ------------------------------ drivers/isdn/hisax/st5481_hdlc.h | 62 --- drivers/isdn/hisax/st5481_usb.c | 10 drivers/isdn/hisax/tei.c | 2 drivers/isdn/hisax/teleint.c | 4 drivers/isdn/hisax/teles0.c | 4 drivers/isdn/hisax/teles3.c | 4 drivers/isdn/hisax/telespci.c | 4 drivers/isdn/hisax/w6692.c | 6 60 files changed, 263 insertions(+), 1050 deletions(-)
drivers/isdn/hisax/Makefile renamed from drivers/isdn/hisax/Makefile.old +1 -1
@@ -23,7 +23,7 @@ # Multipart objects. hisax_st5481-y := st5481_init.o st5481_usb.o st5481_d.o \ - st5481_b.o st5481_hdlc.o + st5481_b.o hisax-y := config.o isdnl1.o tei.o isdnl2.o isdnl3.o \ lmgr.o q931.o callc.o fsm.o
drivers/isdn/hisax/amd7930_fn.c renamed from drivers/isdn/hisax/amd7930_fn.c.old +4 -4
@@ -97,7 +97,7 @@ }; -void /* macro wWordAMD */ +static void /* macro wWordAMD */ WriteWordAmd7930 (struct IsdnCardState *cs,BYTE reg,WORD val) {wByteAMD (cs,0x00 , reg);
@@ -105,7 +105,7 @@wByteAMD (cs,0x01 ,HIBYTE (val)); } -WORD /* macro rWordAMD */ +static WORD /* macro rWordAMD */ ReadWordAmd7930 (struct IsdnCardState *cs,BYTE reg) {WORD res;
@@ -665,7 +665,7 @@ } } -void +static void setstack_Amd7930 (struct PStack *st,struct IsdnCardState *cs) {
@@ -676,7 +676,7 @@ } -void +static void DC_Close_Amd7930 (struct IsdnCardState *cs) {if (cs->debug &L1_DEB_ISAC )debugl1 (cs,"Amd7930: DC_Close called" );
drivers/isdn/hisax/asuscom.c renamed from drivers/isdn/hisax/asuscom.c.old +2 -2
@@ -22,7 +22,7 @@extern const char *CardType[]; -const char *Asuscom_revision ="$Revision: 1.14.2.4 $" ; +static const char *Asuscom_revision ="$Revision: 1.14.2.4 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -239,7 +239,7 @@return IRQ_HANDLED ; } -void +static void release_io_asuscom (struct IsdnCardState *cs) {int bytecnt =8 ;
drivers/isdn/hisax/avm_pci.c renamed from drivers/isdn/hisax/avm_pci.c.old +10 -8
@@ -172,7 +172,7 @@return (NULL ); } -void +static void write_ctrl (struct BCState *bcs,int which) {if (bcs->cs->debug &L1_DEB_HSCX )
@@ -193,7 +193,7 @@ } } -void +static void modehdlc (struct BCState *bcs,int mode,int bc) {struct IsdnCardState *cs = bcs->cs;
@@ -451,7 +451,7 @@ } } -inline void +static inline void HDLC_irq_main (struct IsdnCardState *cs) {u_int stat;
@@ -487,7 +487,7 @@ } } -void +static void hdlc_l2l1 (struct PStack *st,int pr,void *arg) {struct BCState *bcs = st->l1.bcs;
@@ -547,7 +547,7 @@ } } -void +static void close_hdlcstate (struct BCState *bcs) {modehdlc (bcs,0 ,0 );
@@ -570,7 +570,7 @@ } } -int +static int open_hdlcstate (struct IsdnCardState *cs,struct BCState *bcs) {if (!test_and_set_bit (BC_FLG_INIT , &bcs->Flag)) {
@@ -598,7 +598,7 @@return (0 ); } -int +static int setstack_hdlc (struct PStack *st,struct BCState *bcs) { bcs->channel = st->l1.bc;
@@ -612,6 +612,7 @@return (0 ); } +#if 0 void __init clear_pending_hdlc_ints (struct IsdnCardState *cs) {
@@ -641,8 +642,9 @@ debugl1(cs, "HDLC 2 VIN %x", val); } } +#endif /* 0 */ -void __init +static void __init inithdlc (struct IsdnCardState *cs) { cs->bcs[0 ].BC_SetStack = setstack_hdlc;
drivers/isdn/hisax/bkm_a4t.c renamed from drivers/isdn/hisax/bkm_a4t.c.old +2 -2
@@ -23,7 +23,7 @@extern const char *CardType[]; -const char *bkm_a4t_revision ="$Revision: 1.22.2.4 $" ; +static const char *bkm_a4t_revision ="$Revision: 1.22.2.4 $" ; static inline u_char
@@ -167,7 +167,7 @@ } } -void +static void release_io_bkm (struct IsdnCardState *cs) {if (cs->hw.ax.base) {
drivers/isdn/hisax/bkm_a8.c renamed from drivers/isdn/hisax/bkm_a8.c.old +3 -3
@@ -27,7 +27,7 @@extern const char *CardType[]; -const char sct_quadro_revision[] ="$Revision: 1.22.2.4 $" ; +static const char sct_quadro_revision[] ="$Revision: 1.22.2.4 $" ;static const char *sct_quadro_subtypes[] = {
@@ -193,7 +193,7 @@return IRQ_HANDLED ; } -void +static void release_io_sct_quadro (struct IsdnCardState *cs) {release_region (cs->hw.ax.base &0xffffffc0 ,128 );
@@ -261,7 +261,7 @@return (0 ); } -int __init +static int __init sct_alloc_io (u_int adr,u_int len) {if (!request_region (adr, len,"scitel" )) {
drivers/isdn/hisax/callc.c renamed from drivers/isdn/hisax/callc.c.old +3 -3
@@ -874,7 +874,7 @@ } } -struct Channel +static struct Channel *selectfreechannel (struct PStack *st,int bch) {struct IsdnCardState *cs = st->l1.hardware;
@@ -1429,7 +1429,7 @@HiSax_putstatus (chanp->cs,"Ch" ,"%d CAPIMSG %s" , chanp->chan, tmpbuf); } -void +static void lli_got_fac_req (struct Channel *chanp,capi_msg *cm) {if ((cm->para[0 ] !=3 ) || (cm->para[1 ] !=0 ))return ;
@@ -1454,7 +1454,7 @@ } } -void +static void lli_got_manufacturer (struct Channel *chanp,struct IsdnCardState *cs,capi_msg *cm) {if ((cs->typ ==ISDN_CTYPE_ELSA ) || (cs->typ ==ISDN_CTYPE_ELSA_PNP ) || (cs->typ ==ISDN_CTYPE_ELSA_PCI )) {
drivers/isdn/hisax/hisax.h renamed from drivers/isdn/hisax/hisax.h.old +0 -5
@@ -1271,7 +1271,6 @@void init_bcstate (struct IsdnCardState *cs,int bc);void setstack_HiSax (struct PStack *st,struct IsdnCardState *cs); -unsigned int random_ri (void );void HiSax_addlist (struct IsdnCardState *sp,struct PStack *st);void HiSax_rmlist (struct IsdnCardState *sp,struct PStack *st);
@@ -1315,15 +1314,11 @@void LogFrame (struct IsdnCardState *cs,u_char * p,int size);void dlogframe (struct IsdnCardState *cs,struct sk_buff *skb,int dir);void iecpy (u_char * dest,u_char * iestart,int ieoffset); -#ifdef ISDN_CHIP_ISAC -void setstack_isac (struct PStack *st,struct IsdnCardState *cs); -#endif /* ISDN_CHIP_ISAC */ #endif /* __KERNEL__ */ #define HZDELAY (jiffs) {int tout = jiffs; while (tout--) udelay(1000000/HZ);}int ll_run (struct IsdnCardState *cs,int addfeatures); -void ll_stop (struct IsdnCardState *cs);int CallcNew (void );void CallcFree (void );int CallcNewChan (struct IsdnCardState *cs);
drivers/isdn/hisax/config.c renamed from drivers/isdn/hisax/config.c.old +8 -6
@@ -332,7 +332,7 @@#define HISAX_IDSIZE (HISAX_MAX_CARDS*8)static char HiSaxID[HISAX_IDSIZE ] = {0 , }; -char *HiSax_id = HiSaxID; +static char *HiSax_id = HiSaxID;#ifdef MODULE /* Variables for insmod */ static int type[HISAX_MAX_CARDS ] = {0 , };
@@ -391,7 +391,7 @@return rev; } -void __init HiSaxVersion (void ) +static void __init HiSaxVersion (void ) {char tmp[64 ];
@@ -608,6 +608,7 @@/* * Find card with given card number */ +#if 0 struct IsdnCardState *hisax_get_card (int cardnr) {if ((cardnr <= nrcards) && (cardnr >0 ))
@@ -615,8 +616,9 @@return cards[cardnr -1 ].cs; return NULL; } +#endif /* 0 */ -int HiSax_readstatus (u_char __user *buf,int len,int id,int channel) +static int HiSax_readstatus (u_char __user *buf,int len,int id,int channel) {int count, cnt;u_char __user *p = buf;
@@ -768,7 +770,7 @@return 0 ; } -void ll_stop (struct IsdnCardState *cs) +static void ll_stop (struct IsdnCardState *cs) {isdn_ctrl ic;
@@ -1184,7 +1186,7 @@return ret; } -void HiSax_shiftcards (int idx) +static void HiSax_shiftcards (int idx) {int i;
@@ -1192,7 +1194,7 @@memcpy (&cards[i], &cards[i +1 ],sizeof (cards[i])); } -int HiSax_inithardware (int *busy_flag) +static int HiSax_inithardware (int *busy_flag) {int foundcards =0 ;int i =0 ;
drivers/isdn/hisax/diva.c renamed from drivers/isdn/hisax/diva.c.old +2 -2
@@ -28,7 +28,7 @@extern const char *CardType[]; -const char *Diva_revision ="$Revision: 1.33.2.6 $" ; +static const char *Diva_revision ="$Revision: 1.33.2.6 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -706,7 +706,7 @@return IRQ_HANDLED ; } -void +static void release_io_diva (struct IsdnCardState *cs) {int bytecnt;
drivers/isdn/hisax/elsa.c renamed from drivers/isdn/hisax/elsa.c.old +4 -4
@@ -33,13 +33,13 @@extern const char *CardType[]; -const char *Elsa_revision ="$Revision: 2.32.2.4 $" ; -const char *Elsa_Types[] = +static const char *Elsa_revision ="$Revision: 2.32.2.4 $" ; +static const char *Elsa_Types[] = {"None" ,"PC" ,"PCC-8" ,"PCC-16" ,"PCF" ,"PCF-Pro" ,"PCMCIA" ,"QS 1000" ,"QS 3000" ,"Microlink PCI" ,"QS 3000 PCI" ,"PCMCIA-IPAC" }; -const char *ITACVer[] = +static const char *ITACVer[] = {"?0?" ,"?1?" ,"?2?" ,"?3?" ,"?4?" ,"V2.2" ,"B1" ,"A1" };
@@ -425,7 +425,7 @@return IRQ_HANDLED ; } -void +static void release_io_elsa (struct IsdnCardState *cs) {int bytecnt =8 ;
drivers/isdn/hisax/elsa_ser.c renamed from drivers/isdn/hisax/elsa_ser.c.old +10 -10
@@ -237,7 +237,7 @@#endif } -inline int +static inline int write_modem (struct BCState *bcs) {int ret=0 ;struct IsdnCardState *cs = bcs->cs;
@@ -275,7 +275,7 @@return (ret); } -inline void +static inline void modem_fill (struct BCState *bcs) {if (bcs->tx_skb) {
@@ -422,7 +422,7 @@extern void modehscx (struct BCState *bcs,int mode,int bc);extern void hscx_l2l1 (struct PStack *st,int pr,void *arg); -void +static void close_elsastate (struct BCState *bcs) {modehscx (bcs,0 , bcs->channel);
@@ -442,7 +442,7 @@ } } -void +static void modem_write_cmd (struct IsdnCardState *cs,u_char *buf,int len) {int count, fp;u_char *msg = buf;
@@ -472,7 +472,7 @@ } } -void +static void modem_set_init (struct IsdnCardState *cs) {int timeout;
@@ -521,7 +521,7 @@udelay (RCV_DELAY ); } -void +static void modem_set_dial (struct IsdnCardState *cs,int outgoing) {int timeout;#define RCV_DELAY 20000
@@ -543,7 +543,7 @@udelay (RCV_DELAY ); } -void +static void modem_l2l1 (struct PStack *st,int pr,void *arg) {struct BCState *bcs = st->l1.bcs;
@@ -579,7 +579,7 @@ } } -int +static int setstack_elsa (struct PStack *st,struct BCState *bcs) {
@@ -614,7 +614,7 @@return (0 ); } -void +static void init_modem (struct IsdnCardState *cs) { cs->bcs[0 ].BC_SetStack = setstack_elsa;
@@ -641,7 +641,7 @@modem_set_init (cs); } -void +static void release_modem (struct IsdnCardState *cs) { cs->hw.elsa.MFlag =0 ;
drivers/isdn/hisax/enternow_pci.c renamed from drivers/isdn/hisax/enternow_pci.c.old +52 -39
220 lines not on this page · raw message
drivers/isdn/hisax/gazel.c renamed from drivers/isdn/hisax/gazel.c.old +3 -2
@@ -21,7 +21,7 @@#include <linux/pci.h> extern const char *CardType[]; -const char *gazel_revision ="$Revision: 2.19.2.4 $" ; +static const char *gazel_revision ="$Revision: 2.19.2.4 $" ;#define R647 1#define R685 2
@@ -317,7 +317,8 @@spin_unlock_irqrestore (&cs->lock, flags);return IRQ_HANDLED ; } -void + +static void release_io_gazel (struct IsdnCardState *cs) {unsigned int i;
drivers/isdn/hisax/hfc_2bds0.c renamed from drivers/isdn/hisax/hfc_2bds0.c.old +6 -6
@@ -345,7 +345,7 @@debugl1 (cs,"send_data %d blocked" , bcs->channel); } -void +static void main_rec_2bds0 (struct BCState *bcs) {struct IsdnCardState *cs = bcs->cs;
@@ -399,7 +399,7 @@return ; } -void +static void mode_2bs0 (struct BCState *bcs,int mode,int bc) {struct IsdnCardState *cs = bcs->cs;
@@ -505,7 +505,7 @@ } } -void +static void close_2bs0 (struct BCState *bcs) {mode_2bs0 (bcs,0 , bcs->channel);
@@ -534,7 +534,7 @@return (0 ); } -int +static int setstack_2b (struct PStack *st,struct BCState *bcs) { bcs->channel = st->l1.bc;
@@ -1004,7 +1004,7 @@ } } -void +static void setstack_hfcd (struct PStack *st,struct IsdnCardState *cs) { st->l1.l1hw = HFCD_l1hw;
@@ -1015,7 +1015,7 @@ { } -unsigned int __init +static unsigned int __init *init_send_hfcd (int cnt) {int i, *send;
drivers/isdn/hisax/hfc_2bs0.c renamed from drivers/isdn/hisax/hfc_2bs0.c.old +6 -6
@@ -52,7 +52,7 @@return (to); } -int +static int GetFreeFifoBytes (struct BCState *bcs) {int s;
@@ -66,7 +66,7 @@return (s); } -int +static int ReadZReg (struct BCState *bcs,u_char reg) {int val;
@@ -394,7 +394,7 @@return ; } -void +static void mode_hfc (struct BCState *bcs,int mode,int bc) {struct IsdnCardState *cs = bcs->cs;
@@ -507,7 +507,7 @@ } -void +static void close_hfcstate (struct BCState *bcs) {mode_hfc (bcs,0 , bcs->channel);
@@ -537,7 +537,7 @@return (0 ); } -int +static int setstack_hfc (struct PStack *st,struct BCState *bcs) { bcs->channel = st->l1.bc;
@@ -551,7 +551,7 @@return (0 ); } -void __init +static void __init init_send (struct BCState *bcs) {int i;
drivers/isdn/hisax/hfc_pci.h renamed from drivers/isdn/hisax/hfc_pci.h.old +0 -1
@@ -232,5 +232,4 @@#define Read_hfc (a,b) (*(((u_char *)a->hw.hfcpci.pci_io)+b))extern void main_irq_hcpci (struct BCState *bcs); -extern void inithfcpci (struct IsdnCardState *cs);extern void releasehfcpci (struct IsdnCardState *cs);
drivers/isdn/hisax/hfc_pci.c renamed from drivers/isdn/hisax/hfc_pci.c.old +6 -6
@@ -70,7 +70,7 @@/******************************************/ /* free hardware resources used by driver */ /******************************************/ -void +static void release_io_hfcpci (struct IsdnCardState *cs) { printk(KERN_INFO "HiSax: release hfcpci at %p\n",
@@ -394,7 +394,7 @@/*******************************************************************************/ /* check for transparent receive data and read max one threshold size if avail */ /*******************************************************************************/ -int +static int hfcpci_empty_fifo_trans (struct BCState *bcs,bzfifo_type * bz,u_char * bdata) {unsigned short *z1r, *z2r;
@@ -446,7 +446,7 @@/**********************************/ /* B-channel main receive routine */ /**********************************/ -void +static void main_rec_hfcpci (struct BCState *bcs) {struct IsdnCardState *cs = bcs->cs;
@@ -1244,7 +1244,7 @@/***********************************************/ /* called during init setting l1 stack pointer */ /***********************************************/ -void +static void setstack_hfcpci (struct PStack *st,struct IsdnCardState *cs) { st->l1.l1hw = HFCPCI_l1hw;
@@ -1268,7 +1268,7 @@/***************************************************************/ /* activate/deactivate hardware for selected channels and mode */ /***************************************************************/ -void +static void mode_hfcpci (struct BCState *bcs,int mode,int bc) {struct IsdnCardState *cs = bcs->cs;
@@ -1579,7 +1579,7 @@/********************************/ /* called for card init message */ /********************************/ -void __init +static void __init inithfcpci (struct IsdnCardState *cs) { cs->bcs[0 ].BC_SetStack = setstack_2b;
drivers/isdn/hisax/hfc_sx.h renamed from drivers/isdn/hisax/hfc_sx.h.old +0 -1
@@ -193,5 +193,4 @@ };extern void main_irq_hfcsx (struct BCState *bcs); -extern void inithfcsx (struct IsdnCardState *cs);extern void releasehfcsx (struct IsdnCardState *cs);
drivers/isdn/hisax/hfc_sx.c renamed from drivers/isdn/hisax/hfc_sx.c.old +5 -5
@@ -308,7 +308,7 @@/******************************************/ /* free hardware resources used by driver */ /******************************************/ -void +static void release_io_hfcsx (struct IsdnCardState *cs) { cs->hw.hfcsx.int_m2 =0 ;/* interrupt output off ! */
@@ -472,7 +472,7 @@/**********************************/ /* B-channel main receive routine */ /**********************************/ -void +static void main_rec_hfcsx (struct BCState *bcs) {struct IsdnCardState *cs = bcs->cs;
@@ -1003,7 +1003,7 @@/***********************************************/ /* called during init setting l1 stack pointer */ /***********************************************/ -void +static void setstack_hfcsx (struct PStack *st,struct IsdnCardState *cs) { st->l1.l1hw = HFCSX_l1hw;
@@ -1027,7 +1027,7 @@/***************************************************************/ /* activate/deactivate hardware for selected channels and mode */ /***************************************************************/ -void +static void mode_hfcsx (struct BCState *bcs,int mode,int bc) {struct IsdnCardState *cs = bcs->cs;
@@ -1328,7 +1328,7 @@/********************************/ /* called for card init message */ /********************************/ -void __devinit +static void __devinit inithfcsx (struct IsdnCardState *cs) { cs->setstack_d = setstack_hfcsx;
drivers/isdn/hisax/hfc_usb.h renamed from drivers/isdn/hisax/hfc_usb.h.old +2 -2
@@ -168,7 +168,7 @@* 3 entries are the configuration number, the minimum interval for * Interrupt endpoints & boolean if E-channel logging possible */ -int validconf[][19 ] = { +static int validconf[][19 ] = {// INT in, ISO out config {EP_NUL ,EP_INT ,EP_NUL ,EP_INT ,EP_NUL ,EP_INT ,EP_NOP ,EP_INT ,EP_ISO ,EP_NUL ,EP_ISO ,EP_NUL ,EP_ISO ,EP_NUL ,EP_NUL ,EP_NUL ,
@@ -187,7 +187,7 @@ };// string description of chosen config -char *conf_str[] = { +static char *conf_str[] = {"4 Interrupt IN + 3 Isochron OUT" ,"3 Interrupt IN + 3 Isochron OUT" ,"4 Isochron IN + 3 Isochron OUT" ,
drivers/isdn/hisax/hfc_usb.c renamed from drivers/isdn/hisax/hfc_usb.c.old +3 -3
@@ -60,7 +60,7 @@#include "hisax_debug.h" static u_int debug;module_param (debug, uint,0 ); -int hfc_debug; +static int hfc_debug;#endif
@@ -85,7 +85,7 @@* VendorID, ProductID, Devicename, LED_SCHEME, * LED's BitMask in HFCUSB_P_DATA Register : LED_USB, LED_S0, LED_B1, LED_B2 */ -vendor_data vdata[] = { +static vendor_data vdata[] = {/* CologneChip Eval TA */ {0x0959 ,0x2bd0 ,"ISDN USB TA (Cologne Chip HFC-S USB based)" ,LED_OFF , {4 ,0 ,2 ,1 }
@@ -1137,7 +1137,7 @@ } } -void +static void hfc_usb_l2l1 (struct hisax_if *my_hisax_if,int pr,void *arg) {usb_fifo *fifo = my_hisax_if->priv;
drivers/isdn/hisax/hfcscard.c renamed from drivers/isdn/hisax/hfcscard.c.old +1 -1
@@ -52,7 +52,7 @@*/ } -void +static void release_io_hfcs (struct IsdnCardState *cs) {release2bds0 (cs);
drivers/isdn/hisax/hscx.c renamed from drivers/isdn/hisax/hscx.c.old +2 -2
@@ -151,7 +151,7 @@ } } -void +static void close_hscxstate (struct BCState *bcs) {modehscx (bcs,0 , bcs->channel);
@@ -203,7 +203,7 @@return (0 ); } -int +static int setstack_hscx (struct PStack *st,struct BCState *bcs) { bcs->channel = st->l1.bc;
drivers/isdn/hisax/icc.c renamed from drivers/isdn/hisax/icc.c.old +3 -3
@@ -108,7 +108,7 @@#endif } -void +static void icc_empty_fifo (struct IsdnCardState *cs,int count) {u_char *ptr;
@@ -563,13 +563,13 @@ } } -void +static void setstack_icc (struct PStack *st,struct IsdnCardState *cs) { st->l1.l1hw = ICC_l1hw; } -void +static void DC_Close_icc (struct IsdnCardState *cs) {if (cs->dc.icc.mon_rx) {kfree (cs->dc.icc.mon_rx);
drivers/isdn/hisax/ipacx.c renamed from drivers/isdn/hisax/ipacx.c.old +0 -86
103 lines not on this page · raw message
drivers/isdn/hisax/isac.c renamed from drivers/isdn/hisax/isac.c.old +3 -3
@@ -112,7 +112,7 @@#endif } -void +static void isac_empty_fifo (struct IsdnCardState *cs,int count) {u_char *ptr;
@@ -563,13 +563,13 @@ } } -void +static void setstack_isac (struct PStack *st,struct IsdnCardState *cs) { st->l1.l1hw = ISAC_l1hw; } -void +static void DC_Close_isac (struct IsdnCardState *cs) {if (cs->dc.isac.mon_rx) {kfree (cs->dc.isac.mon_rx);
drivers/isdn/hisax/isar.c renamed from drivers/isdn/hisax/isar.c.old +24 -22
146 lines not on this page · raw message
drivers/isdn/hisax/isdnl1.c renamed from drivers/isdn/hisax/isdnl1.c.old +4 -4
@@ -151,7 +151,7 @@va_end (args); } -void +static void L1activated (struct IsdnCardState *cs) {struct PStack *st;
@@ -166,7 +166,7 @@ } } -void +static void L1deactivated (struct IsdnCardState *cs) {struct PStack *st;
@@ -370,7 +370,7 @@#ifdef L2FRAME_DEBUG /* psa */ -char * +static char *l2cmd (u_char cmd) {switch (cmd & ~0x10 ) {
@@ -404,7 +404,7 @@static char tmpdeb[32 ]; -char * +static char *l2frames (u_char * ptr) {switch (ptr[2 ] & ~0x10 ) {
drivers/isdn/hisax/isdnl2.c renamed from drivers/isdn/hisax/isdnl2.c.old +42 -58
335 lines not on this page · raw message
drivers/isdn/hisax/isdnl3.c renamed from drivers/isdn/hisax/isdnl3.c.old +1 -1
@@ -390,7 +390,7 @@ } } -void +static void isdnl3_trans (struct PStack *st,int pr,void *arg) { st->l3.l3l2 (st, pr, arg); }
drivers/isdn/hisax/isurf.c renamed from drivers/isdn/hisax/isurf.c.old +1 -1
@@ -122,7 +122,7 @@return IRQ_HANDLED ; } -void +static void release_io_isurf (struct IsdnCardState *cs) {release_region (cs->hw.isurf.reset,1 );
drivers/isdn/hisax/ix1_micro.c renamed from drivers/isdn/hisax/ix1_micro.c.old +2 -2
@@ -25,7 +25,7 @@#include "isdnl1.h" extern const char *CardType[]; -const char *ix1_revision ="$Revision: 2.12.2.4 $" ; +static const char *ix1_revision ="$Revision: 2.12.2.4 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -162,7 +162,7 @@return IRQ_HANDLED ; } -void +static void release_io_ix1micro (struct IsdnCardState *cs) {if (cs->hw.ix1.cfg_reg)
drivers/isdn/hisax/jade.h renamed from drivers/isdn/hisax/jade.h.old +0 -1
@@ -128,7 +128,6 @@#define jade_TXAUDIOCH2CFG 0x1Aextern int JadeVersion (struct IsdnCardState *cs,char *s); -extern void modejade (struct BCState *bcs,int mode,int bc);extern void clear_pending_jade_ints (struct IsdnCardState *cs);extern void initjade (struct IsdnCardState *cs);
drivers/isdn/hisax/jade.c renamed from drivers/isdn/hisax/jade.c.old +3 -3
@@ -74,7 +74,7 @@ -void +static void modejade (struct BCState *bcs,int mode,int bc) {struct IsdnCardState *cs = bcs->cs;
@@ -190,7 +190,7 @@ } } -void +static void close_jadestate (struct BCState *bcs) {modejade (bcs,0 , bcs->channel);
@@ -243,7 +243,7 @@ } -int +static int setstack_jade (struct PStack *st,struct BCState *bcs) { bcs->channel = st->l1.bc;
drivers/isdn/hisax/l3_1tr6.c renamed from drivers/isdn/hisax/l3_1tr6.c.old +1 -1
@@ -19,7 +19,7 @@#include <linux/ctype.h> extern char *HiSax_getrev (const char *revision); -const char *l3_1tr6_revision ="$Revision: 2.15.2.3 $" ; +static const char *l3_1tr6_revision ="$Revision: 2.15.2.3 $" ;#define MsgHead (ptr, cref, mty, dis) \ *ptr++ = dis; \
drivers/isdn/hisax/l3dss1.c renamed from drivers/isdn/hisax/l3dss1.c.old +1 -1
@@ -26,7 +26,7 @@#include <linux/config.h> extern char *HiSax_getrev (const char *revision); -const char *dss1_revision ="$Revision: 2.32.2.3 $" ; +static const char *dss1_revision ="$Revision: 2.32.2.3 $" ;#define EXT_BEARER_CAPS 1
drivers/isdn/hisax/l3ni1.c renamed from drivers/isdn/hisax/l3ni1.c.old +2 -2
@@ -24,7 +24,7 @@#include <linux/ctype.h> extern char *HiSax_getrev (const char *revision); -const char *ni1_revision ="$Revision: 2.8.2.3 $" ; +static const char *ni1_revision ="$Revision: 2.8.2.3 $" ;#define EXT_BEARER_CAPS 1
@@ -2665,7 +2665,7 @@l3ni1_SendSpid ( pc, pr, arg,20 ); } -void l3ni1_spid_epid (struct l3_process *pc,u_char pr,void *arg ) +static void l3ni1_spid_epid (struct l3_process *pc,u_char pr,void *arg ) {struct sk_buff *skb = arg;
drivers/isdn/hisax/mic.c renamed from drivers/isdn/hisax/mic.c.old +2 -2
@@ -18,7 +18,7 @@extern const char *CardType[]; -const char *mic_revision ="$Revision: 1.12.2.4 $" ; +static const char *mic_revision ="$Revision: 1.12.2.4 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -157,7 +157,7 @@return IRQ_HANDLED ; } -void +static void release_io_mic (struct IsdnCardState *cs) {int bytecnt =8 ;
drivers/isdn/hisax/netjet.c renamed from drivers/isdn/hisax/netjet.c.old +5 -7
@@ -25,8 +25,6 @@#include <asm/io.h> #include "netjet.h" -const char *NETjet_revision ="$Revision: 1.29.2.4 $" ; -/* Interface functions */ u_char
@@ -66,7 +64,7 @@outsb (cs->hw.njet.isac, data, size); } -void fill_mem (struct BCState *bcs,u_int *pos,u_int cnt,int chan,u_char fill) +static void fill_mem (struct BCState *bcs,u_int *pos,u_int cnt,int chan,u_char fill) {u_int mask=0x000000ff , val =0 , *p=pos;u_int i;
@@ -85,7 +83,7 @@ } } -void +static void mode_tiger (struct BCState *bcs,int mode,int bc) {struct IsdnCardState *cs = bcs->cs;
@@ -852,7 +850,7 @@ } -void +static void close_tigerstate (struct BCState *bcs) {mode_tiger (bcs,0 , bcs->channel);
@@ -900,7 +898,7 @@return (0 ); } -int +static int setstack_tiger (struct PStack *st,struct BCState *bcs) { bcs->channel = st->l1.bc;
@@ -966,7 +964,7 @@ cs->bcs[1 ].BC_Close = close_tigerstate; } -void +static void releasetiger (struct IsdnCardState *cs) {if (cs->bcs[0 ].hw.tiger.send) {
drivers/isdn/hisax/niccy.c renamed from drivers/isdn/hisax/niccy.c.old +2 -2
@@ -24,7 +24,7 @@#include <linux/isapnp.h> extern const char *CardType[]; -const char *niccy_revision ="$Revision: 1.21.2.4 $" ; +static const char *niccy_revision ="$Revision: 1.21.2.4 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -178,7 +178,7 @@return IRQ_HANDLED ; } -void +static void release_io_niccy (struct IsdnCardState *cs) {if (cs->subtyp ==NICCY_PCI ) {
drivers/isdn/hisax/nj_s.c renamed from drivers/isdn/hisax/nj_s.c.old +1 -1
@@ -15,7 +15,7 @@#include <linux/ppp_defs.h> #include "netjet.h" -const char *NETjet_S_revision ="$Revision: 2.13.2.4 $" ; +static const char *NETjet_S_revision ="$Revision: 2.13.2.4 $" ;static u_char dummyrr (struct IsdnCardState *cs,int chan,u_char off) {
drivers/isdn/hisax/nj_u.c renamed from drivers/isdn/hisax/nj_u.c.old +1 -1
@@ -15,7 +15,7 @@#include <linux/ppp_defs.h> #include "netjet.h" -const char *NETjet_U_revision ="$Revision: 2.14.2.3 $" ; +static const char *NETjet_U_revision ="$Revision: 2.14.2.3 $" ;static u_char dummyrr (struct IsdnCardState *cs,int chan,u_char off) {
drivers/isdn/hisax/q931.c renamed from drivers/isdn/hisax/q931.c.old +2 -2
@@ -516,7 +516,7 @@ {CAUSE_UserInfoDiscarded, "User Info Discarded"} }; -int cause_1tr6_len = (sizeof (cause_1tr6) /sizeof (struct MessageType )); +static int cause_1tr6_len = (sizeof (cause_1tr6) /sizeof (struct MessageType ));static int prcause_1tr6 (char *dest,u_char * p)
@@ -935,7 +935,7 @@return (dp - dest); } -int +static int prfacility (char *dest,u_char * p) {char *dp = dest;
drivers/isdn/hisax/s0box.c renamed from drivers/isdn/hisax/s0box.c.old +2 -2
@@ -17,7 +17,7 @@#include "isdnl1.h" extern const char *CardType[]; -const char *s0box_revision ="$Revision: 2.6.2.4 $" ; +static const char *s0box_revision ="$Revision: 2.6.2.4 $" ;static inline void writereg (unsigned int padr,signed int addr,u_char off,u_char val) {
@@ -183,7 +183,7 @@return IRQ_HANDLED ; } -void +static void release_io_s0box (struct IsdnCardState *cs) {release_region (cs->hw.teles3.cfg_reg,8 );
drivers/isdn/hisax/saphir.c renamed from drivers/isdn/hisax/saphir.c.old +1 -1
@@ -171,7 +171,7 @@mod_timer (&cs->hw.saphir.timer, jiffies+1 *HZ ); } -void +static void release_io_saphir (struct IsdnCardState *cs) {byteout (cs->hw.saphir.cfg_reg +IRQ_REG ,0xff );
drivers/isdn/hisax/sedlbauer.c renamed from drivers/isdn/hisax/sedlbauer.c.old +3 -3
@@ -51,9 +51,9 @@extern const char *CardType[]; -const char *Sedlbauer_revision ="$Revision: 1.34.2.6 $" ; +static const char *Sedlbauer_revision ="$Revision: 1.34.2.6 $" ; -const char *Sedlbauer_Types[] = +static const char *Sedlbauer_Types[] = {"None" ,"speed card/win" ,"speed star" ,"speed fax+" ,"speed win II / ISDN PC/104" ,"speed star II" ,"speed pci" ,"speed fax+ pyramid" ,"speed fax+ pci" ,"HST Saphir III" };
@@ -394,7 +394,7 @@return IRQ_HANDLED ; } -void +static void release_io_sedlbauer (struct IsdnCardState *cs) {int bytecnt =8 ;
drivers/isdn/hisax/sportster.c renamed from drivers/isdn/hisax/sportster.c.old +3 -3
@@ -19,7 +19,7 @@#include "isdnl1.h" extern const char *CardType[]; -const char *sportster_revision ="$Revision: 1.16.2.4 $" ; +static const char *sportster_revision ="$Revision: 1.16.2.4 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -132,7 +132,7 @@return IRQ_HANDLED ; } -void +static void release_io_sportster (struct IsdnCardState *cs) {int i, adr;
@@ -144,7 +144,7 @@ } } -void +static void reset_sportster (struct IsdnCardState *cs) { cs->hw.spt.res_irq |=SPORTSTER_RESET ;/* Reset On */
drivers/isdn/hisax/st5481.h renamed from drivers/isdn/hisax/st5481.h.old +0 -4
@@ -450,12 +450,8 @@ usb_complete_t complete, void *context);void st5481_release_isocpipes (struct urb * urb[2 ]); -int st5481_isoc_flatten (struct urb *urb);void st5481_usb_pipe_reset (struct st5481_adapter *adapter,u_char pipe,ctrl_complete_t complete,void *context); -void st5481_usb_ctrl_msg (struct st5481_adapter *adapter, -u8 request,u8 requesttype,u16 value,u16 index, -ctrl_complete_t complete,void *context);void st5481_usb_device_ctrl_msg (struct st5481_adapter *adapter,u8 request,u16 value,ctrl_complete_t complete,void *context);
drivers/isdn/hisax/st5481_usb.c renamed from drivers/isdn/hisax/st5481_usb.c.old +6 -4
@@ -15,6 +15,8 @@#include <linux/slab.h> #include "st5481.h" +static int st5481_isoc_flatten (struct urb *urb); +/* ====================================================================== * control pipe */
@@ -55,9 +57,9 @@* Asynchronous endpoint 0 request (async version of usb_control_msg). * The request will be queued up in a FIFO if the endpoint is busy. */ -void usb_ctrl_msg (struct st5481_adapter *adapter, -u8 request,u8 requesttype,u16 value,u16 index, -ctrl_complete_t complete,void *context) +static void usb_ctrl_msg (struct st5481_adapter *adapter, +u8 request,u8 requesttype,u16 value,u16 index, +ctrl_complete_t complete,void *context) {struct st5481_ctrl *ctrl = &adapter->ctrl;int w_index;
@@ -571,7 +573,7 @@* Make the transfer_buffer contiguous by * copying from the iso descriptors if necessary. */ -int st5481_isoc_flatten (struct urb *urb) +static int st5481_isoc_flatten (struct urb *urb) {struct usb_iso_packet_descriptor *pipd,*pend;unsigned char *src,*dst;
drivers/isdn/hisax/tei.c renamed from drivers/isdn/hisax/tei.c.old +1 -1
@@ -74,7 +74,7 @@ "EV_T202", }; -unsigned int +static unsigned int random_ri (void ) {unsigned int x;
drivers/isdn/hisax/teleint.c renamed from drivers/isdn/hisax/teleint.c.old +2 -2
@@ -18,7 +18,7 @@extern const char *CardType[]; -const char *TeleInt_revision ="$Revision: 1.16.2.5 $" ; +static const char *TeleInt_revision ="$Revision: 1.16.2.5 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -203,7 +203,7 @@add_timer (&cs->hw.hfc.timer); } -void +static void release_io_TeleInt (struct IsdnCardState *cs) {del_timer (&cs->hw.hfc.timer);
drivers/isdn/hisax/teles0.c renamed from drivers/isdn/hisax/teles0.c.old +2 -2
@@ -23,7 +23,7 @@extern const char *CardType[]; -const char *teles0_revision ="$Revision: 2.15.2.4 $" ; +static const char *teles0_revision ="$Revision: 2.15.2.4 $" ;#define TELES_IOMEM_SIZE 0x400#define byteout (addr,val) outb(val,addr)
@@ -183,7 +183,7 @@return IRQ_HANDLED ; } -void +static void release_io_teles0 (struct IsdnCardState *cs) {if (cs->hw.teles0.cfg_reg)
drivers/isdn/hisax/teles3.c renamed from drivers/isdn/hisax/teles3.c.old +2 -2
@@ -21,7 +21,7 @@#include "isdnl1.h" extern const char *CardType[]; -const char *teles3_revision ="$Revision: 2.19.2.4 $" ; +static const char *teles3_revision ="$Revision: 2.19.2.4 $" ;#define byteout (addr,val) outb(val,addr)#define bytein (addr) inb(addr)
@@ -154,7 +154,7 @@release_region (cs->hw.teles3.hscx[1 ] +32 ,32 ); } -void +static void release_io_teles3 (struct IsdnCardState *cs) {if (cs->typ ==ISDN_CTYPE_TELESPCMCIA ) {
drivers/isdn/hisax/telespci.c renamed from drivers/isdn/hisax/telespci.c.old +2 -2
@@ -21,7 +21,7 @@#include <linux/pci.h> extern const char *CardType[]; -const char *telespci_revision ="$Revision: 2.23.2.3 $" ; +static const char *telespci_revision ="$Revision: 2.23.2.3 $" ;#define ZORAN_PO_RQ_PEN 0x02000000#define ZORAN_PO_WR 0x00800000
@@ -257,7 +257,7 @@return IRQ_HANDLED ; } -void +static void release_io_telespci (struct IsdnCardState *cs) {iounmap (cs->hw.teles0.membase);
drivers/isdn/hisax/w6692.c renamed from drivers/isdn/hisax/w6692.c.old +3 -3
@@ -41,7 +41,7 @@extern const char *CardType[]; -const char *w6692_revision ="$Revision: 1.18.2.4 $" ; +static const char *w6692_revision ="$Revision: 1.18.2.4 $" ;#define DBUSY_TIMER_VALUE 80
@@ -880,7 +880,7 @@return (0 ); } -void resetW6692 (struct IsdnCardState *cs) +static void resetW6692 (struct IsdnCardState *cs) { cs->writeW6692 (cs,W_D_CTL ,W_D_CTL_SRST );mdelay (10 );
@@ -902,7 +902,7 @@ } } -void __init initW6692 (struct IsdnCardState *cs,int part) +static void __init initW6692 (struct IsdnCardState *cs,int part) {if (part &1 ) { cs->setstack_d = setstack_W6692;
drivers/isdn/hisax/enternow.h deleted +0 -51
51 lines not on this page · raw message
drivers/isdn/hisax/st5481_hdlc.h deleted +0 -62
62 lines not on this page · raw message
drivers/isdn/hisax/st5481_hdlc.c deleted +0 -580
580 lines not on this page · raw message
drivers/isdn/hisax/hfc4s8s_l1.c renamed from drivers/isdn/hisax/hfc4s8s_l1.c.old +1 -1
@@ -1357,7 +1357,7 @@/********************************************/ /* disable/enable hardware in nt or te mode */ /********************************************/ -void +static void hfc_hardware_enable (hfc4s8s_hw * hw,int enable,int nt_mode) {u_long flags;