[PATCH] ISDN: Remove defunct test emulator

Based on advice from K.  Keil, get rid of remaining traces of defunct test
emulator for HISAX.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 34ab5f7dcabc1daa4087893bde2c58c568687afa..12d91fb9f8cb9503d72bcb09adcd51ebe804fe11 100644 (file)
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -340,8 +340,6 @@ config HISAX_HFC_SX
          This enables HiSax support for the HFC-S+, HFC-SP and HFC-PCMCIA
          cards. This code is not finished yet.
 
-#      bool '  TESTEMULATOR (EXPERIMENTAL)' CONFIG_HISAX_TESTEMU
-
 config HISAX_ENTERNOW_PCI
        bool "Formula-n enter:now PCI card"
        depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV))

diff --git a/drivers/isdn/hisax/Makefile b/drivers/isdn/hisax/Makefile
index 293e27789d54caf983ec2b6d0b53b80548e89e64..c7a3794bdae47c8d65ca003676d290a4524a1c04 100644 (file)
--- a/drivers/isdn/hisax/Makefile
+++ b/drivers/isdn/hisax/Makefile
@@ -60,5 +60,4 @@ hisax-$(CONFIG_HISAX_SCT_QUADRO)      += bkm_a8.o isac.o arcofi.o hscx.o
 hisax-$(CONFIG_HISAX_GAZEL)            += gazel.o isac.o arcofi.o hscx.o
 hisax-$(CONFIG_HISAX_W6692)            += w6692.o
 hisax-$(CONFIG_HISAX_ENTERNOW_PCI)     += enternow_pci.o amd7930_fn.o
-#hisax-$(CONFIG_HISAX_TESTEMU)         += testemu.o
 

diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 29e98f7c2076978563c78eeb1f939402de234d78..da4196f21e0fcc555398e110baa07ffa96830e6a 100644 (file)
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -549,10 +549,6 @@ extern int setup_isurf(struct IsdnCard *card);
 extern int setup_saphir(struct IsdnCard *card);
 #endif
 
-#if CARD_TESTEMU
-extern int setup_testemu(struct IsdnCard *card);
-#endif
-
 #if CARD_BKM_A4T
 extern int setup_bkm_a4t(struct IsdnCard *card);
 #endif
@@ -1061,11 +1057,6 @@ static int checkcard(int cardnr, char *id, int *busy_flag, struct module *lockow
                ret = setup_saphir(card);
                break;
 #endif
-#if CARD_TESTEMU
-       case ISDN_CTYPE_TESTEMU:
-               ret = setup_testemu(card);
-               break;
-#endif
 #if    CARD_BKM_A4T
        case ISDN_CTYPE_BKM_A4T:
                ret = setup_bkm_a4t(card);

diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 3f1137e34678f60cfe1a8d7f3102c1de349d9cac..3cd8d5ba239beb8f3a355c6c7edf3e33f87f98d0 100644 (file)
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -795,19 +795,6 @@ struct w6692_hw {
        struct timer_list timer;
 };
 
-#ifdef  CONFIG_HISAX_TESTEMU
-struct te_hw {
-       unsigned char *sfifo;
-       unsigned char *sfifo_w;
-       unsigned char *sfifo_r;
-       unsigned char *sfifo_e;
-       int sfifo_cnt;
-       unsigned int stat;
-       wait_queue_head_t rwaitq;
-       wait_queue_head_t swaitq;
-};
-#endif
-
 struct arcofi_msg {
        struct arcofi_msg *next;
        u_char receive;
@@ -916,9 +903,6 @@ struct IsdnCardState {
                struct ix1_hw niccy;
                struct isurf_hw isurf;
                struct saphir_hw saphir;
-#ifdef CONFIG_HISAX_TESTEMU
-               struct te_hw te;
-#endif
                struct bkm_hw ax;
                struct gazel_hw gazel;
                struct w6692_hw w6692;
@@ -1175,15 +1159,6 @@ struct IsdnCardState {
 #define CARD_HSTSAPHIR 0
 #endif
 
-#ifdef CONFIG_HISAX_TESTEMU
-#define        CARD_TESTEMU 1
-#define ISDN_CTYPE_TESTEMU 99
-#undef ISDN_CTYPE_COUNT
-#define  ISDN_CTYPE_COUNT ISDN_CTYPE_TESTEMU
-#else
-#define CARD_TESTEMU 0
-#endif
-
 #ifdef CONFIG_HISAX_BKM_A4T
 #define        CARD_BKM_A4T 1
 #ifndef ISDN_CHIP_ISAC