Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream

12 files changed, 73 insertions, 121 deletions

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 34ab5f7dcabc..12d91fb9f8cb 100644
--- 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 293e27789d54..c7a3794bdae4 100644
--- 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 17ec0b70ba1d..da4196f21e0f 100644
--- 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);
@@ -1881,7 +1872,7 @@ static struct pci_device_id hisax_pci_tbl[] __devinitdata = {
         {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_DJINN_ITOO,   PCI_ANY_ID, PCI_ANY_ID},
         {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_OLITEC,       PCI_ANY_ID, PCI_ANY_ID},
 #endif
-#ifdef CONFIG_HISAX_QUADRO
+#ifdef CONFIG_HISAX_SCT_QUADRO
         {PCI_VENDOR_ID_PLX,      PCI_DEVICE_ID_PLX_9050,         PCI_ANY_ID, PCI_ANY_ID},
 #endif
 #ifdef CONFIG_HISAX_NICCY
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c
index 0279fb323cb1..ae377e812775 100644
--- a/drivers/isdn/hisax/elsa_ser.c
+++ b/drivers/isdn/hisax/elsa_ser.c
@@ -58,7 +58,7 @@ static inline unsigned int serial_in(struct IsdnCardState *cs, int offset)
 static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset)
 {
 #ifdef SERIAL_DEBUG_REG
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
+#ifdef ELSA_SERIAL_NOPAUSE_IO
         u_int val = inb(cs->hw.elsa.base + 8 + offset);
         debugl1(cs,"inp  %s %02x",ModemIn[offset], val);
 #else
@@ -67,7 +67,7 @@ static inline unsigned int serial_inp(struct IsdnCardState *cs, int offset)
 #endif
         return(val);
 #else
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
+#ifdef ELSA_SERIAL_NOPAUSE_IO
         return inb(cs->hw.elsa.base + 8 + offset);
 #else
         return inb_p(cs->hw.elsa.base + 8 + offset);
@@ -87,13 +87,13 @@ static inline void serial_outp(struct IsdnCardState *cs, int offset,
                                int value)
 {
 #ifdef SERIAL_DEBUG_REG
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
+#ifdef ELSA_SERIAL_NOPAUSE_IO
         debugl1(cs,"outp %s %02x",ModemOut[offset], value);
 #else
         debugl1(cs,"outP %s %02x",ModemOut[offset], value);
 #endif
 #endif
-#ifdef CONFIG_SERIAL_NOPAUSE_IO
+#ifdef ELSA_SERIAL_NOPAUSE_IO
         outb(value, cs->hw.elsa.base + 8 + offset);
 #else
         outb_p(value, cs->hw.elsa.base + 8 + offset);
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index a2fa4ecb8c88..ab98e135bcbb 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -199,7 +199,7 @@ typedef struct _hfc4s8s_hw {
 /***************************/
 /* inline function defines */
 /***************************/
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM      /* inline functions mempry mapped */
+#ifdef HISAX_HFC4S8S_PCIMEM     /* inline functions memory mapped */
 
 /* memory write and dummy IO read to avoid PCI byte merge problems */
 #define Write_hfc8(a,b,c) {(*((volatile u_char *)(a->membase+b)) = c); inb(a->iobase+4);}
@@ -305,7 +305,7 @@ wait_busy(hfc4s8s_hw * a)
 
 #define PCI_ENA_REGIO   0x01
 
-#endif                          /* CONFIG_HISAX_HFC4S8S_PCIMEM */
+#endif                          /* HISAX_HFC4S8S_PCIMEM */
 
 /******************************************************/
 /* function to read critical counter registers that   */
@@ -724,12 +724,12 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
                         } else {
                                 /* read errornous D frame */
 
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
                                 SetRegAddr(l1p->hw, A_FIFO_DATA0);
 #endif
 
                                 while (z1 >= 4) {
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                                         Read_hfc32(l1p->hw, A_FIFO_DATA0);
 #else
                                         fRead_hfc32(l1p->hw);
@@ -738,7 +738,7 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
                                 }
 
                                 while (z1--)
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                                         Read_hfc8(l1p->hw, A_FIFO_DATA0);
 #else
                                         fRead_hfc8(l1p->hw);
@@ -752,12 +752,12 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
 
                 cp = skb->data;
 
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
                 SetRegAddr(l1p->hw, A_FIFO_DATA0);
 #endif
 
                 while (z1 >= 4) {
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                         *((unsigned long *) cp) =
                             Read_hfc32(l1p->hw, A_FIFO_DATA0);
 #else
@@ -768,7 +768,7 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
                 }
 
                 while (z1--)
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                         *cp++ = Read_hfc8(l1p->hw, A_FIFO_DATA0);
 #else
                         *cp++ = fRead_hfc8(l1p->hw);
@@ -858,12 +858,12 @@ rx_b_frame(struct hfc4s8s_btype *bch)
                         wait_busy(l1->hw);
                         return;
                 }
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
                 SetRegAddr(l1->hw, A_FIFO_DATA0);
 #endif
 
                 while (z1 >= 4) {
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                         *((unsigned long *) bch->rx_ptr) =
                             Read_hfc32(l1->hw, A_FIFO_DATA0);
 #else
@@ -875,7 +875,7 @@ rx_b_frame(struct hfc4s8s_btype *bch)
                 }
 
                 while (z1--)
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                         *(bch->rx_ptr++) = Read_hfc8(l1->hw, A_FIFO_DATA0);
 #else
                         *(bch->rx_ptr++) = fRead_hfc8(l1->hw);
@@ -939,12 +939,12 @@ tx_d_frame(struct hfc4s8s_l1 *l1p)
         if ((skb = skb_dequeue(&l1p->d_tx_queue))) {
                 cp = skb->data;
                 cnt = skb->len;
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
                 SetRegAddr(l1p->hw, A_FIFO_DATA0);
 #endif
 
                 while (cnt >= 4) {
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                         fWrite_hfc32(l1p->hw, A_FIFO_DATA0,
                                      *(unsigned long *) cp);
 #else
@@ -955,7 +955,7 @@ tx_d_frame(struct hfc4s8s_l1 *l1p)
                         cnt -= 4;
                 }
 
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                 while (cnt--)
                         fWrite_hfc8(l1p->hw, A_FIFO_DATA0, *cp++);
 #else
@@ -1036,11 +1036,11 @@ tx_b_frame(struct hfc4s8s_btype *bch)
                 cp = skb->data + bch->tx_cnt;
                 bch->tx_cnt += cnt;
 
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
                 SetRegAddr(l1->hw, A_FIFO_DATA0);
 #endif
                 while (cnt >= 4) {
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                         fWrite_hfc32(l1->hw, A_FIFO_DATA0,
                                      *(unsigned long *) cp);
 #else
@@ -1051,7 +1051,7 @@ tx_b_frame(struct hfc4s8s_btype *bch)
                 }
 
                 while (cnt--)
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
                         fWrite_hfc8(l1->hw, A_FIFO_DATA0, *cp++);
 #else
                         fWrite_hfc8(l1->hw, *cp++);
@@ -1280,7 +1280,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)
         if (!hw || !(hw->mr.r_irq_ctrl & M_GLOB_IRQ_EN))
                 return IRQ_NONE;
 
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
         /* read current selected regsister */
         old_ioreg = GetRegAddr(hw);
 #endif
@@ -1291,7 +1291,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)
         if (!
             (b = (Read_hfc8(hw, R_STATUS) & (M_MISC_IRQSTA | M_FR_IRQSTA)))
 && !hw->mr.r_irq_statech) {
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
                 SetRegAddr(hw, old_ioreg);
 #endif
                 return IRQ_NONE;
@@ -1321,7 +1321,7 @@ hfc4s8s_interrupt(int intno, void *dev_id)
         /* queue the request to allow other cards to interrupt */
         schedule_work(&hw->tqueue);
 
-#ifndef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifndef HISAX_HFC4S8S_PCIMEM
         SetRegAddr(hw, old_ioreg);
 #endif
         return IRQ_HANDLED;
@@ -1470,7 +1470,7 @@ static void
 release_pci_ports(hfc4s8s_hw * hw)
 {
         pci_write_config_word(hw->pdev, PCI_COMMAND, 0);
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
         if (hw->membase)
                 iounmap((void *) hw->membase);
 #else
@@ -1485,7 +1485,7 @@ release_pci_ports(hfc4s8s_hw * hw)
 static void
 enable_pci_ports(hfc4s8s_hw * hw)
 {
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
         pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_MEMIO);
 #else
         pci_write_config_word(hw->pdev, PCI_COMMAND, PCI_ENA_REGIO);
@@ -1560,7 +1560,7 @@ setup_instance(hfc4s8s_hw * hw)
                        hw->irq);
                 goto out;
         }
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
         printk(KERN_INFO
                "HFC-4S/8S: found PCI card at membase 0x%p, irq %d\n",
                hw->hw_membase, hw->irq);
@@ -1613,7 +1613,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         hw->irq = pdev->irq;
         hw->iobase = pci_resource_start(pdev, 0);
 
-#ifdef CONFIG_HISAX_HFC4S8S_PCIMEM
+#ifdef HISAX_HFC4S8S_PCIMEM
         hw->hw_membase = (u_char *) pci_resource_start(pdev, 1);
         hw->membase = ioremap((ulong) hw->hw_membase, 256);
 #else
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c
index 5a6989f23fcf..42bbae2a646c 100644
--- a/drivers/isdn/hisax/hfc_usb.c
+++ b/drivers/isdn/hisax/hfc_usb.c
@@ -183,7 +183,7 @@ typedef struct hfcusb_data {
         int vend_idx;           /* vendor found */
         int b_mode[2];          /* B-channel mode */
         int l1_activated;       /* layer 1 activated */
-        int disc_flag;          /* TRUE if device was disonnected to avoid some USB actions */
+        int disc_flag;          /* 'true' if device was disonnected to avoid some USB actions */
         int packet_size, iso_packet_size;
 
         /* control pipe background handling */
@@ -392,7 +392,7 @@ l1_timer_expire_t3(hfcusb_data * hfc)
         DBG(ISDN_DBG,
             "HFC-S USB: PH_DEACTIVATE | INDICATION sent (T3 expire)");
 #endif
-        hfc->l1_activated = FALSE;
+        hfc->l1_activated = false;
         handle_led(hfc, LED_S0_OFF);
         /* deactivate : */
         queue_control_request(hfc, HFCUSB_STATES, 0x10, 1);
@@ -411,7 +411,7 @@ l1_timer_expire_t4(hfcusb_data * hfc)
         DBG(ISDN_DBG,
             "HFC-S USB: PH_DEACTIVATE | INDICATION sent (T4 expire)");
 #endif
-        hfc->l1_activated = FALSE;
+        hfc->l1_activated = false;
         handle_led(hfc, LED_S0_OFF);
 }
 
@@ -452,7 +452,7 @@ state_handler(hfcusb_data * hfc, __u8 state)
 #ifdef CONFIG_HISAX_DEBUG
                 DBG(ISDN_DBG, "HFC-S USB: PH_ACTIVATE | INDICATION sent");
 #endif
-                hfc->l1_activated = TRUE;
+                hfc->l1_activated = true;
                 handle_led(hfc, LED_S0_ON);
         } else if (state <= 3 /* && activated */ ) {
                 if (old_state == 7 || old_state == 8) {
@@ -472,7 +472,7 @@ state_handler(hfcusb_data * hfc, __u8 state)
                         DBG(ISDN_DBG,
                             "HFC-S USB: PH_DEACTIVATE | INDICATION sent");
 #endif
-                        hfc->l1_activated = FALSE;
+                        hfc->l1_activated = false;
                         handle_led(hfc, LED_S0_OFF);
                 }
         }
@@ -622,7 +622,7 @@ tx_iso_complete(struct urb *urb)
         if (fifo->active && !status) {
                 transp_mode = 0;
                 if (fifon < 4 && hfc->b_mode[fifon / 2] == L1_MODE_TRANS)
-                        transp_mode = TRUE;
+                        transp_mode = true;
 
                 /* is FifoFull-threshold set for our channel? */
                 threshbit = threshtable[fifon] & hfc->threshold_mask;
@@ -640,7 +640,7 @@ tx_iso_complete(struct urb *urb)
                               tx_iso_complete, urb->context);
                 memset(context_iso_urb->buffer, 0,
                        sizeof(context_iso_urb->buffer));
-                frame_complete = FALSE;
+                frame_complete = false;
                 /* Generate next Iso Packets */
                 for (k = 0; k < num_isoc_packets; ++k) {
                         if (fifo->skbuff) {
@@ -666,7 +666,7 @@ tx_iso_complete(struct urb *urb)
                                                 /* add 2 byte flags and 16bit CRC at end of ISDN frame */
                                                 fifo->bit_line += 32;
                                         }
-                                        frame_complete = TRUE;
+                                        frame_complete = true;
                                 }
 
                                 memcpy(context_iso_urb->buffer +
@@ -693,7 +693,7 @@ tx_iso_complete(struct urb *urb)
                         }
 
                         if (frame_complete) {
-                                fifo->delete_flg = TRUE;
+                                fifo->delete_flg = true;
                                 fifo->hif->l1l2(fifo->hif,
                                                 PH_DATA | CONFIRM,
                                                 (void *) (unsigned long) fifo->skbuff->
@@ -701,9 +701,9 @@ tx_iso_complete(struct urb *urb)
                                 if (fifo->skbuff && fifo->delete_flg) {
                                         dev_kfree_skb_any(fifo->skbuff);
                                         fifo->skbuff = NULL;
-                                        fifo->delete_flg = FALSE;
+                                        fifo->delete_flg = false;
                                 }
-                                frame_complete = FALSE;
+                                frame_complete = false;
                         }
                 }
                 errcode = usb_submit_urb(urb, GFP_ATOMIC);
@@ -837,7 +837,7 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
         fifon = fifo->fifonum;
         transp_mode = 0;
         if (fifon < 4 && hfc->b_mode[fifon / 2] == L1_MODE_TRANS)
-                transp_mode = TRUE;
+                transp_mode = true;
 
         if (!fifo->skbuff) {
                 fifo->skbuff = dev_alloc_skb(fifo->max_size + 3);
@@ -1176,7 +1176,7 @@ hfc_usb_l2l1(struct hisax_if *my_hisax_if, int pr, void *arg)
                         if (fifo->skbuff && fifo->delete_flg) {
                                 dev_kfree_skb_any(fifo->skbuff);
                                 fifo->skbuff = NULL;
-                                fifo->delete_flg = FALSE;
+                                fifo->delete_flg = false;
                         }
                         fifo->skbuff = arg;     /* we have a new buffer */
                         break;
@@ -1262,8 +1262,8 @@ usb_init(hfcusb_data * hfc)
         hfc->b_mode[0] = L1_MODE_NULL;
         hfc->b_mode[1] = L1_MODE_NULL;
 
-        hfc->l1_activated = FALSE;
-        hfc->disc_flag = FALSE;
+        hfc->l1_activated = false;
+        hfc->disc_flag = false;
         hfc->led_state = 0;
         hfc->led_new_data = 0;
         hfc->old_led_state = 0;
@@ -1404,7 +1404,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
                         /* check for config EOL element */
                         while (validconf[cfg_used][0]) {
-                                cfg_found = TRUE;
+                                cfg_found = true;
                                 vcf = validconf[cfg_used];
                                 /* first endpoint descriptor */
                                 ep = iface->endpoint;
@@ -1426,7 +1426,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                 idx++;
                                         attr = ep->desc.bmAttributes;
                                         if (cmptbl[idx] == EP_NUL) {
-                                                cfg_found = FALSE;
+                                                cfg_found = false;
                                         }
                                         if (attr == USB_ENDPOINT_XFER_INT
                                             && cmptbl[idx] == EP_INT)
@@ -1448,7 +1448,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                                             "HFC-S USB: Interrupt Endpoint interval < %d found - skipping config",
                                                             vcf[17]);
 #endif
-                                                cfg_found = FALSE;
+                                                cfg_found = false;
                                         }
                                         ep++;
                                 }
@@ -1456,7 +1456,7 @@ hfc_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                                         /* all entries must be EP_NOP or EP_NUL for a valid config */
                                         if (cmptbl[i] != EP_NOP
                                             && cmptbl[i] != EP_NUL)
-                                                cfg_found = FALSE;
+                                                cfg_found = false;
                                 }
                                 if (cfg_found) {
                                         if (cfg_used < small_match) {
@@ -1656,7 +1656,7 @@ hfc_usb_disconnect(struct usb_interface
         hfcusb_data *context = usb_get_intfdata(intf);
         int i;
         printk(KERN_INFO "HFC-S USB: device disconnect\n");
-        context->disc_flag = TRUE;
+        context->disc_flag = true;
         usb_set_intfdata(intf, NULL);
         if (!context)
                 return;
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h
index 6349367ed480..471f2354dfde 100644
--- a/drivers/isdn/hisax/hfc_usb.h
+++ b/drivers/isdn/hisax/hfc_usb.h
@@ -12,9 +12,6 @@
 
 #define VERBOSE_USB_DEBUG
 
-#define TRUE  1
-#define FALSE 0
-
 
 /***********/
 /* defines */
diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 3f1137e34678..3cd8d5ba239b 100644
--- 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
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c
index 6f1a6583b17d..9df9e3548cf1 100644
--- a/drivers/isdn/hisax/isar.c
+++ b/drivers/isdn/hisax/isar.c
@@ -431,7 +431,6 @@ reterror:
         return(ret);
 }
 
-extern void BChannel_bh(struct BCState *);
 #define B_LL_NOCARRIER  8
 #define B_LL_CONNECT    9
 #define B_LL_OK         10
diff --git a/drivers/isdn/hisax/isdnl1.h b/drivers/isdn/hisax/isdnl1.h
index 0e88cfabdf10..172ad4c8c961 100644
--- a/drivers/isdn/hisax/isdnl1.h
+++ b/drivers/isdn/hisax/isdnl1.h
@@ -21,12 +21,11 @@
 #define B_XMTBUFREADY   1
 #define B_ACKPENDING    2
 
-extern void debugl1(struct IsdnCardState *cs, char *fmt, ...);
-extern void DChannel_proc_xmt(struct IsdnCardState *cs);
-extern void DChannel_proc_rcv(struct IsdnCardState *cs);
-extern void l1_msg(struct IsdnCardState *cs, int pr, void *arg);
-extern void l1_msg_b(struct PStack *st, int pr, void *arg);
-
-#ifdef L2FRAME_DEBUG
-extern void Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf, int dir);
-#endif
+void debugl1(struct IsdnCardState *cs, char *fmt, ...);
+void DChannel_proc_xmt(struct IsdnCardState *cs);
+void DChannel_proc_rcv(struct IsdnCardState *cs);
+void l1_msg(struct IsdnCardState *cs, int pr, void *arg);
+void l1_msg_b(struct PStack *st, int pr, void *arg);
+void Logl2Frame(struct IsdnCardState *cs, struct sk_buff *skb, char *buf,
+                int dir);
+void BChannel_bh(struct work_struct *work);
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
index 281fa27d9f00..935f23356fae 100644
--- a/drivers/isdn/hisax/isdnl3.c
+++ b/drivers/isdn/hisax/isdnl3.c
@@ -231,18 +231,6 @@ no_l3_proto_spec(struct PStack *st, isdn_ctrl *ic)
         return(-1);
 }
 
-#ifdef  CONFIG_HISAX_EURO
-extern void setstack_dss1(struct PStack *st);
-#endif
-
-#ifdef  CONFIG_HISAX_NI1
-extern void setstack_ni1(struct PStack *st);
-#endif
-
-#ifdef  CONFIG_HISAX_1TR6
-extern void setstack_1tr6(struct PStack *st);
-#endif
-
 struct l3_process
 *getl3proc(struct PStack *st, int cr)
 {
diff --git a/drivers/isdn/hisax/isdnl3.h b/drivers/isdn/hisax/isdnl3.h
index 1dbe0297a506..749498fe6c4b 100644
--- a/drivers/isdn/hisax/isdnl3.h
+++ b/drivers/isdn/hisax/isdnl3.h
@@ -25,13 +25,19 @@ struct stateentry {
 
 #define l3_debug(st, fmt, args...) HiSax_putstatus(st->l1.hardware, "l3 ", fmt, ## args)
 
-extern void newl3state(struct l3_process *pc, int state);
-extern void L3InitTimer(struct l3_process *pc, struct L3Timer *t);
-extern void L3DelTimer(struct L3Timer *t);
-extern int L3AddTimer(struct L3Timer *t, int millisec, int event);
-extern void StopAllL3Timer(struct l3_process *pc);
-extern struct sk_buff *l3_alloc_skb(int len);
-extern struct l3_process *new_l3_process(struct PStack *st, int cr);
-extern void release_l3_process(struct l3_process *p);
-extern struct l3_process *getl3proc(struct PStack *st, int cr);
-extern void l3_msg(struct PStack *st, int pr, void *arg);
+struct PStack;
+
+void newl3state(struct l3_process *pc, int state);
+void L3InitTimer(struct l3_process *pc, struct L3Timer *t);
+void L3DelTimer(struct L3Timer *t);
+int L3AddTimer(struct L3Timer *t, int millisec, int event);
+void StopAllL3Timer(struct l3_process *pc);
+struct sk_buff *l3_alloc_skb(int len);
+struct l3_process *new_l3_process(struct PStack *st, int cr);
+void release_l3_process(struct l3_process *p);
+struct l3_process *getl3proc(struct PStack *st, int cr);
+void l3_msg(struct PStack *st, int pr, void *arg);
+void setstack_dss1(struct PStack *st);
+void setstack_ni1(struct PStack *st);
+void setstack_1tr6(struct PStack *st);
+