---

yaml
---
r: 159068
b: refs/heads/master
c: 99783e2
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 436b355b96042ab6564f43a7dabd5c61d9634ff7
+refs/heads/master: 99783e2cde6eccbd31efeb03a79f26bb5f239c36

trunk/drivers/isdn/Kconfig

@@ -21,6 +21,8 @@ menuconfig ISDN
 
 if ISDN
 
+source "drivers/isdn/mISDN/Kconfig"
+
 menuconfig ISDN_I4L
 	tristate "Old ISDN4Linux (deprecated)"
 	---help---
@@ -39,9 +41,9 @@ menuconfig ISDN_I4L
 	  It is still available, though, for use with adapters that are not
 	  supported by the new CAPI subsystem yet.
 
-source "drivers/isdn/mISDN/Kconfig"
-
+if ISDN_I4L
 source "drivers/isdn/i4l/Kconfig"
+endif
 
 menuconfig ISDN_CAPI
 	tristate "CAPI 2.0 subsystem"

trunk/drivers/isdn/act2000/capi.c

@@ -78,6 +78,7 @@ static actcapi_msgdsc valid_msg[] = {
 #endif
 	{{ 0x00, 0x00}, NULL},
 };
+#define num_valid_msg (sizeof(valid_msg)/sizeof(actcapi_msgdsc))
 #define num_valid_imsg 27 /* MANUFACTURER_IND */
 
 /*
@@ -1024,7 +1025,7 @@ actcapi_debug_msg(struct sk_buff *skb, int direction)
 #ifdef DEBUG_DUMP_SKB
 	dump_skb(skb);
 #endif
-	for (i = 0; i < ARRAY_SIZE(valid_msg); i++)
+	for (i = 0; i < num_valid_msg; i++)
 		if ((msg->hdr.cmd.cmd == valid_msg[i].cmd.cmd) &&
 		    (msg->hdr.cmd.subcmd == valid_msg[i].cmd.subcmd)) {
 			descr = valid_msg[i].description;

trunk/drivers/isdn/act2000/module.c

@@ -23,6 +23,7 @@ static unsigned short act2000_isa_ports[] =
         0x0200, 0x0240, 0x0280, 0x02c0, 0x0300, 0x0340, 0x0380,
         0xcfe0, 0xcfa0, 0xcf60, 0xcf20, 0xcee0, 0xcea0, 0xce60,
 };
+#define ISA_NRPORTS (sizeof(act2000_isa_ports)/sizeof(unsigned short))
 
 static act2000_card *cards = (act2000_card *) NULL;
 
@@ -685,21 +686,21 @@ act2000_addcard(int bus, int port, int irq, char *id)
 		 * This may result in more than one card detected.
 		 */
 		switch (bus) {
-		case ACT2000_BUS_ISA:
-			for (i = 0; i < ARRAY_SIZE(act2000_isa_ports); i++)
-				if (act2000_isa_detect(act2000_isa_ports[i])) {
-					printk(KERN_INFO "act2000: Detected "
-						"ISA card at port 0x%x\n",
-						act2000_isa_ports[i]);
-					act2000_alloccard(bus,
-						act2000_isa_ports[i], irq, id);
-				}
-			break;
-		case ACT2000_BUS_MCA:
-		case ACT2000_BUS_PCMCIA:
-		default:
-			printk(KERN_WARNING
-				"act2000: addcard: Invalid BUS type %d\n", bus);
+			case ACT2000_BUS_ISA:
+				for (i = 0; i < ISA_NRPORTS; i++)
+					if (act2000_isa_detect(act2000_isa_ports[i])) {
+						printk(KERN_INFO
+						       "act2000: Detected ISA card at port 0x%x\n",
+						       act2000_isa_ports[i]);
+						act2000_alloccard(bus, act2000_isa_ports[i], irq, id);
+					}
+				break;
+			case ACT2000_BUS_MCA:
+			case ACT2000_BUS_PCMCIA:
+			default:
+				printk(KERN_WARNING
+				       "act2000: addcard: Invalid BUS type %d\n",
+				       bus);
 		}
 	}
 	if (!cards)

trunk/drivers/isdn/hardware/eicon/message.c

@@ -551,7 +551,9 @@ word api_put(APPL   * appl, CAPI_MSG   * msg)
   dbug(1,dprintf("com=%x",msg->header.command));
 
   for(j=0;j<MAX_MSG_PARMS+1;j++) msg_parms[j].length = 0;
-  for(i=0, ret = _BAD_MSG; i < ARRAY_SIZE(ftable); i++) {
+  for(i=0, ret = _BAD_MSG;
+      i<(sizeof(ftable)/sizeof(struct _ftable));
+      i++) {
 
     if(ftable[i].command==msg->header.command) {
       /* break loop if the message is correct, otherwise continue scan  */

trunk/drivers/isdn/hardware/eicon/os_4bri.c

@@ -149,7 +149,8 @@ int diva_4bri_init_card(diva_os_xdi_adapter_t * a)
 	diva_os_xdi_adapter_t *diva_current;
 	diva_os_xdi_adapter_t *adapter_list[4];
 	PISDN_ADAPTER Slave;
-	unsigned long bar_length[ARRAY_SIZE(_4bri_bar_length)];
+	unsigned long bar_length[sizeof(_4bri_bar_length) /
+				 sizeof(_4bri_bar_length[0])];
 	int v2 = _4bri_is_rev_2_card(a->CardOrdinal);
 	int tasks = _4bri_is_rev_2_bri_card(a->CardOrdinal) ? 1 : MQ_INSTANCE_COUNT;
 	int factor = (tasks == 1) ? 1 : 2;

trunk/drivers/isdn/hardware/mISDN/Kconfig

@@ -39,54 +39,3 @@ config MISDN_HFCUSB
 	  Enable support for USB ISDN TAs with Cologne Chip AG's
 	  HFC-S USB ISDN Controller
 
-config MISDN_AVMFRITZ
-	tristate "Support for AVM FRITZ!CARD PCI"
-	depends on MISDN
-	depends on PCI
-	select MISDN_IPAC
-	help
-	  Enable support for AVMs FRITZ!CARD PCI cards
-
-config MISDN_SPEEDFAX
-	tristate "Support for Sedlbauer Speedfax+"
-	depends on MISDN
-	depends on PCI
-	select MISDN_IPAC
-	select MISDN_ISAR
-	help
-	  Enable support for Sedlbauer Speedfax+.
-
-config MISDN_INFINEON
-	tristate "Support for cards with Infineon chipset"
-	depends on MISDN
-	depends on PCI
-	select MISDN_IPAC
-	help
-	  Enable support for cards with ISAC + HSCX, IPAC or IPAC-SX
-	  chip from Infineon (former manufacturer Siemens).
-
-config MISDN_W6692
-	tristate "Support for cards with Winbond 6692"
-	depends on MISDN
-	depends on PCI
-	help
-	  Enable support for Winbond 6692 PCI chip based cards.
-
-config MISDN_NETJET
-	tristate "Support for NETJet cards"
-	depends on MISDN
-	depends on PCI
-	select MISDN_IPAC
-	select ISDN_HDLC
-	help
-	  Enable support for Traverse Technologies NETJet PCI cards.
-
-
-config MISDN_IPAC
-	tristate
-	depends on MISDN
-
-config MISDN_ISAR
-	tristate
-	depends on MISDN
-

trunk/drivers/isdn/hardware/mISDN/Makefile

@@ -6,11 +6,3 @@
 obj-$(CONFIG_MISDN_HFCPCI) += hfcpci.o
 obj-$(CONFIG_MISDN_HFCMULTI) += hfcmulti.o
 obj-$(CONFIG_MISDN_HFCUSB) += hfcsusb.o
-obj-$(CONFIG_MISDN_AVMFRITZ) += avmfritz.o
-obj-$(CONFIG_MISDN_SPEEDFAX) += speedfax.o
-obj-$(CONFIG_MISDN_INFINEON) += mISDNinfineon.o
-obj-$(CONFIG_MISDN_W6692) += w6692.o
-obj-$(CONFIG_MISDN_NETJET) += netjet.o
-# chip modules
-obj-$(CONFIG_MISDN_IPAC) += mISDNipac.o
-obj-$(CONFIG_MISDN_ISAR) += mISDNisar.o