ISDN: Un-split inithscxisac

It works just as nicely unsplit AFAICS, so no need for the added
complexity.

19 files changed, 28 insertions, 37 deletions

diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c
index cf943f1bddc4..bbaba450f644 100644
--- a/drivers/isdn/hisax/asuscom.c
+++ b/drivers/isdn/hisax/asuscom.c
@@ -295,7 +295,7 @@ Asus_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			return(0);
 		case CARD_INIT:
 			cs->debug |= L1_DEB_IPAC;
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/avm_a1.c b/drivers/isdn/hisax/avm_a1.c
index a87cfd0796d0..68724811c3ee 100644
--- a/drivers/isdn/hisax/avm_a1.c
+++ b/drivers/isdn/hisax/avm_a1.c
@@ -163,10 +163,9 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_ioregs(cs, 0x3f);
 			return(0);
 		case CARD_INIT:
-			inithscxisac(cs, 1);
 			byteout(cs->hw.avm.cfg_reg, 0x16);
 			byteout(cs->hw.avm.cfg_reg, 0x1E);
-			inithscxisac(cs, 2);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/avm_a1p.c b/drivers/isdn/hisax/avm_a1p.c
index 62c15e2f0e07..5b6fa14dfa3f 100644
--- a/drivers/isdn/hisax/avm_a1p.c
+++ b/drivers/isdn/hisax/avm_a1p.c
@@ -224,8 +224,7 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 
 		case CARD_INIT:
 			byteout(cs->hw.avm.cfg_reg+ASL0_OFFSET,ASL0_W_TDISABLE|ASL0_W_TRESET|ASL0_W_IRQENABLE);
-			inithscxisac(cs, 1);
-			inithscxisac(cs, 2);
+			inithscxisac(cs);
 			return 0;
 
 		case CARD_TEST:
diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c
index a0b4282dae01..329a0e91937e 100644
--- a/drivers/isdn/hisax/bkm_a8.c
+++ b/drivers/isdn/hisax/bkm_a8.c
@@ -251,7 +251,7 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 		case CARD_INIT:
 			cs->debug |= L1_DEB_IPAC;
 			set_ipac_active(cs, 1);
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			/* Enable ints */
 			enable_bkm_int(cs, 1);
 			return (0);
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 20ca4c4c1c6b..f7b43a0b9932 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -860,7 +860,7 @@ Diva_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 				ireg = (unsigned int *)cs->hw.diva.pci_cfg;
 				*ireg = PITA_INT0_ENABLE;
 			}
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 600c959a6a49..eedb419f0fc7 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -679,7 +679,6 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			return(0);
 		case CARD_INIT:
 			cs->debug |= L1_DEB_IPAC;
-			inithscxisac(cs, 1);
 			if ((cs->subtyp == ELSA_QS1000) ||
 			    (cs->subtyp == ELSA_QS3000))
 			{
@@ -687,7 +686,7 @@ Elsa_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			}
 			if (cs->hw.elsa.trig)
 				byteout(cs->hw.elsa.trig, 0xff);
-			inithscxisac(cs, 2);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			if ((cs->subtyp == ELSA_PCMCIA) ||
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
index 2ad414bee102..dc960b749e76 100644
--- a/drivers/isdn/hisax/gazel.c
+++ b/drivers/isdn/hisax/gazel.c
@@ -421,7 +421,7 @@ Gazel_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_gazel(cs);
 			return (0);
 		case CARD_INIT:
-			inithscxisac(cs, 1);
+			inithscxisac(cs);
 			if ((cs->subtyp==R647)||(cs->subtyp==R685)) {
 				int i;
 				for (i=0;i<(2+MAX_WAITING_CALLS);i++) {
diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c
index 9eef69d7db26..0a4f7f671f42 100644
--- a/drivers/isdn/hisax/hscx.c
+++ b/drivers/isdn/hisax/hscx.c
@@ -257,21 +257,18 @@ inithscx(struct IsdnCardState *cs)
 
 	modehscx(cs->bcs, 0, 0);
 	modehscx(cs->bcs + 1, 0, 0);
+
+	/* Reenable all IRQ */
+	cs->BC_Write_Reg(cs, 0, HSCX_MASK, 0);
+	cs->BC_Write_Reg(cs, 1, HSCX_MASK, 0);
 }
 
 void __init
-inithscxisac(struct IsdnCardState *cs, int part)
+inithscxisac(struct IsdnCardState *cs)
 {
-	if (part & 1) {
-		initisac(cs);
-		inithscx(cs);
-	}
-	if (part & 2) {
-		/* Reenable all IRQ */
-		cs->writeisac(cs, ISAC_MASK, 0);
-		cs->BC_Write_Reg(cs, 0, HSCX_MASK, 0);
-		cs->BC_Write_Reg(cs, 1, HSCX_MASK, 0);
-		/* RESET Receiver and Transmitter */
-		cs->writeisac(cs, ISAC_CMDR, 0x41);
-	}
+	initisac(cs);
+	inithscx(cs);
+	
+	/* RESET Receiver and Transmitter */
+	cs->writeisac(cs, ISAC_CMDR, 0x41);
 }
diff --git a/drivers/isdn/hisax/hscx.h b/drivers/isdn/hisax/hscx.h
index a43af4a810fd..abb49f0c8f09 100644
--- a/drivers/isdn/hisax/hscx.h
+++ b/drivers/isdn/hisax/hscx.h
@@ -37,5 +37,4 @@
 extern int HscxVersion(struct IsdnCardState *cs, char *s);
 extern void hscx_sched_event(struct BCState *bcs, int event);
 extern void modehscx(struct BCState *bcs, int mode, int bc);
-extern void inithscx(struct IsdnCardState *cs);
-extern void inithscxisac(struct IsdnCardState *cs, int part);
+extern void inithscxisac(struct IsdnCardState *cs);
diff --git a/drivers/isdn/hisax/ix1_micro.c b/drivers/isdn/hisax/ix1_micro.c
index 2cdeb86d44f7..2bcec581de1e 100644
--- a/drivers/isdn/hisax/ix1_micro.c
+++ b/drivers/isdn/hisax/ix1_micro.c
@@ -205,7 +205,7 @@ ix1_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_ix1micro(cs);
 			return(0);
 		case CARD_INIT:
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c
index 97d94239927c..8b9c08e7b9b5 100644
--- a/drivers/isdn/hisax/mic.c
+++ b/drivers/isdn/hisax/mic.c
@@ -188,8 +188,7 @@ mic_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_mic(cs);
 			return(0);
 		case CARD_INIT:
-			inithscx(cs); /* /RTSA := ISAC RST */
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c
index 6caaac80c54f..5ea3cd02fb27 100644
--- a/drivers/isdn/hisax/niccy.c
+++ b/drivers/isdn/hisax/niccy.c
@@ -214,7 +214,7 @@ niccy_reset(struct IsdnCardState *cs)
 		val |= PCI_IRQ_ENABLE;
 		outl(val, cs->hw.niccy.cfg_reg + PCI_IRQ_CTRL_REG);
 	}
-	inithscxisac(cs, 3);
+	inithscxisac(cs);
 }
 
 static int
diff --git a/drivers/isdn/hisax/s0box.c b/drivers/isdn/hisax/s0box.c
index 1e8d88da0884..1c97b691ef17 100644
--- a/drivers/isdn/hisax/s0box.c
+++ b/drivers/isdn/hisax/s0box.c
@@ -207,7 +207,7 @@ S0Box_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_s0box(cs);
 			break;
 		case CARD_INIT:
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			break;
 		case CARD_TEST:
 			break;
diff --git a/drivers/isdn/hisax/saphir.c b/drivers/isdn/hisax/saphir.c
index 4fbd2ee7bcd2..30dea018fafc 100644
--- a/drivers/isdn/hisax/saphir.c
+++ b/drivers/isdn/hisax/saphir.c
@@ -235,7 +235,7 @@ saphir_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_saphir(cs);
 			return(0);
 		case CARD_INIT:
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index 0696ab6f592b..197f712839b9 100644
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -488,7 +488,7 @@ Sedl_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 				/* RESET Receiver and Transmitter */
 				cs->writeisac(cs, ISAC_CMDR, 0x41);
 			} else {
-				inithscxisac(cs, 3);
+				inithscxisac(cs);
 			}
 			return(0);
 		case CARD_TEST:
diff --git a/drivers/isdn/hisax/sportster.c b/drivers/isdn/hisax/sportster.c
index 687cf8504c71..5979cd41c500 100644
--- a/drivers/isdn/hisax/sportster.c
+++ b/drivers/isdn/hisax/sportster.c
@@ -168,10 +168,9 @@ Sportster_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_sportster(cs);
 			return(0);
 		case CARD_INIT:
-			inithscxisac(cs, 1);
+			inithscxisac(cs);
 			cs->hw.spt.res_irq |= SPORTSTER_INTE; /* IRQ On */
 			byteout(cs->hw.spt.cfg_reg + SPORTSTER_RES_IRQ, cs->hw.spt.res_irq);
-			inithscxisac(cs, 2);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/teles0.c b/drivers/isdn/hisax/teles0.c
index dfe161baf900..92eb04fab1b4 100644
--- a/drivers/isdn/hisax/teles0.c
+++ b/drivers/isdn/hisax/teles0.c
@@ -251,7 +251,7 @@ Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_teles0(cs);
 			return(0);
 		case CARD_INIT:
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 02662ebae6cf..44dae27ce44e 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -238,7 +238,7 @@ Teles_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_teles3(cs);
 			return(0);
 		case CARD_INIT:
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);
diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c
index 91eb0d9ffa2f..42e8b5c814d1 100644
--- a/drivers/isdn/hisax/telespci.c
+++ b/drivers/isdn/hisax/telespci.c
@@ -270,7 +270,7 @@ TelesPCI_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			release_io_telespci(cs);
 			return(0);
 		case CARD_INIT:
-			inithscxisac(cs, 3);
+			inithscxisac(cs);
 			return(0);
 		case CARD_TEST:
 			return(0);