ISDN: Move transmitter reset into initisac()

Move some duplicated code into a common and more
sensible place.

drivers/isdn/hisax/avm_pci.c

@@ -731,11 +731,8 @@ AVM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			inithdlc(cs);
 			outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER,
 				cs->hw.avm.cfg_reg + 2);
-			WriteISAC(cs, ISAC_MASK, 0);
 			outb(AVM_STATUS0_DIS_TIMER | AVM_STATUS0_RES_TIMER |
 				AVM_STATUS0_ENA_IRQ, cs->hw.avm.cfg_reg + 2);
-			/* RESET Receiver and Transmitter */
-			WriteISAC(cs, ISAC_CMDR, 0x41);
 			return(0);
 		case CARD_TEST:
 			return(0);

drivers/isdn/hisax/hscx.c

@@ -268,7 +268,4 @@ inithscxisac(struct IsdnCardState *cs)
 {
 	initisac(cs);
 	inithscx(cs);
-	
-	/* RESET Receiver and Transmitter */
-	cs->writeisac(cs, ISAC_CMDR, 0x41);
 }

drivers/isdn/hisax/isac.c

@@ -678,4 +678,7 @@ initisac(struct IsdnCardState *cs)
 	debugl1(cs, "ISAC CIR0 %x", val);
 	cs->dc.isac.ph_state = (val >> 2) & 0xf;
 	isac_sched_event(cs, D_L1STATECHANGE);
+
+	/* RESET Receiver and Transmitter */
+	cs->writeisac(cs, ISAC_CMDR, 0x41);
 }

drivers/isdn/hisax/isurf.c

@@ -158,10 +158,6 @@ ISurf_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 			writeb(0, cs->hw.isurf.isar+ISAR_IRQBIT);mb();
 			initisac(cs);
 			initisar(cs);
-			/* Reenable ISAC IRQ */
-			cs->writeisac(cs, ISAC_MASK, 0);
-			/* RESET Receiver and Transmitter */
-			cs->writeisac(cs, ISAC_CMDR, 0x41);
 			return(0);
 		case CARD_TEST:
 			return(0);
@@ -179,8 +175,6 @@ isurf_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
 			reset_isurf(cs, ISURF_ISAR_EA | ISURF_ISAC_RESET |
 				ISURF_ARCOFI_RESET);
 			initisac(cs);
-			cs->writeisac(cs, ISAC_MASK, 0);
-			cs->writeisac(cs, ISAC_CMDR, 0x41);
 		}
 		return(ret);
 	}

drivers/isdn/hisax/nj_s.c

@@ -131,8 +131,6 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 		case CARD_INIT:
 			inittiger(cs);
 			initisac(cs);
-			/* Reenable all IRQ */
-			cs->writeisac(cs, ISAC_MASK, 0);
 			return(0);
 		case CARD_TEST:
 			return(0);

drivers/isdn/hisax/sedlbauer.c

@@ -483,10 +483,6 @@ Sedl_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 					ISAR_IRQBIT, 0);
 				initisac(cs);
 				initisar(cs);
-				/* Reenable all IRQ */
-				cs->writeisac(cs, ISAC_MASK, 0);
-				/* RESET Receiver and Transmitter */
-				cs->writeisac(cs, ISAC_CMDR, 0x41);
 			} else {
 				inithscxisac(cs);
 			}

drivers/isdn/hisax/teleint.c

@@ -243,9 +243,6 @@ TeleInt_card_msg(struct IsdnCardState *cs, int mt, void *arg)
 		case CARD_INIT:
 			inithfc(cs);
 			initisac(cs);
-			/* Reenable all IRQ */
-			cs->writeisac(cs, ISAC_MASK, 0);
-			cs->writeisac(cs, ISAC_CMDR, 0x41);
 			cs->hw.hfc.timer.expires = jiffies + 1;
 			add_timer(&cs->hw.hfc.timer);
 			return(0);