Commit 672c3fd9 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] 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: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarKai Germaschewski <kai@germaschewski.name>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8b3d4a2a

drivers/isdn/hisax/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ endif 
# 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

+4 −4
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static WORD initAMD[] = { 
};





void /* macro wWordAMD */

static void /* macro wWordAMD */

WriteWordAmd7930(struct IsdnCardState *cs, BYTE reg, WORD val)

{

        wByteAMD(cs, 0x00, reg);
@@ -105,7 +105,7 @@ WriteWordAmd7930(struct IsdnCardState *cs, BYTE reg, WORD val) 
        wByteAMD(cs, 0x01, HIBYTE(val));

}



WORD /* macro rWordAMD */

static WORD /* macro rWordAMD */

ReadWordAmd7930(struct IsdnCardState *cs, BYTE reg)

{

        WORD res;
@@ -665,7 +665,7 @@ Amd7930_l1hw(struct PStack *st, int pr, void *arg) 
	}

}



void

static void

setstack_Amd7930(struct PStack *st, struct IsdnCardState *cs)

{
@@ -676,7 +676,7 @@ setstack_Amd7930(struct PStack *st, struct IsdnCardState *cs) 
}





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

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ Start_IPAC: 
	return IRQ_HANDLED;

}



void

static void

release_io_asuscom(struct IsdnCardState *cs)

{

	int bytecnt = 8;

drivers/isdn/hisax/avm_pci.c

+10 −8
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ struct BCState *Sel_BCS(struct IsdnCardState *cs, int channel) 
		return(NULL);

}



void

static void

write_ctrl(struct BCState *bcs, int which) {



	if (bcs->cs->debug & L1_DEB_HSCX)
@@ -193,7 +193,7 @@ write_ctrl(struct BCState *bcs, int which) { 
	}

}



void

static void

modehdlc(struct BCState *bcs, int mode, int bc)

{

	struct IsdnCardState *cs = bcs->cs;
@@ -451,7 +451,7 @@ HDLC_irq(struct BCState *bcs, u_int stat) { 
	}

}



inline void

static inline void

HDLC_irq_main(struct IsdnCardState *cs)

{

	u_int stat;
@@ -487,7 +487,7 @@ HDLC_irq_main(struct IsdnCardState *cs) 
	}

}



void

static void

hdlc_l2l1(struct PStack *st, int pr, void *arg)

{

	struct BCState *bcs = st->l1.bcs;
@@ -547,7 +547,7 @@ hdlc_l2l1(struct PStack *st, int pr, void *arg) 
	}

}



void

static void

close_hdlcstate(struct BCState *bcs)

{

	modehdlc(bcs, 0, 0);
@@ -570,7 +570,7 @@ close_hdlcstate(struct BCState *bcs) 
	}

}



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 @@ open_hdlcstate(struct IsdnCardState *cs, struct BCState *bcs) 
	return (0);

}



int

static int

setstack_hdlc(struct PStack *st, struct BCState *bcs)

{

	bcs->channel = st->l1.bc;
@@ -612,6 +612,7 @@ setstack_hdlc(struct PStack *st, struct BCState *bcs) 
	return (0);

}



#if 0

void __init

clear_pending_hdlc_ints(struct IsdnCardState *cs)

{
@@ -641,8 +642,9 @@ clear_pending_hdlc_ints(struct IsdnCardState *cs) 
		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

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ bkm_interrupt(int intno, void *dev_id, struct pt_regs *regs) 
	}

}



void

static void

release_io_bkm(struct IsdnCardState *cs)

{

	if (cs->hw.ax.base) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE