7 files changed, 188 insertions, 168 deletions

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 489de81ea609..01a9f1cb7743 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -5,6 +5,13 @@
 menu "ATM drivers"
         depends on NETDEVICES && ATM
 
+config ATM_DUMMY
+        tristate "Dummy ATM driver"
+        depends on ATM
+        help
+          Dummy ATM driver. Useful for proxy signalling, testing,
+          and development.  If unsure, say N.
+
 config ATM_TCP
         tristate "ATM over TCP"
         depends on INET && ATM
diff --git a/drivers/atm/Makefile b/drivers/atm/Makefile
index 5b77188527a9..b5077ce8cb40 100644
--- a/drivers/atm/Makefile
+++ b/drivers/atm/Makefile
@@ -31,6 +31,7 @@ ifeq ($(CONFIG_ATM_IDT77252_USE_SUNI),y)
   obj-$(CONFIG_ATM_IDT77252)    += suni.o
 endif
 
+obj-$(CONFIG_ATM_DUMMY)         += adummy.o
 obj-$(CONFIG_ATM_TCP)           += atmtcp.o
 obj-$(CONFIG_ATM_FIRESTREAM)    += firestream.o
 obj-$(CONFIG_ATM_LANAI)         += lanai.o
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
new file mode 100644
index 000000000000..d15c194be44a
--- /dev/null
+++ b/drivers/atm/adummy.c
@@ -0,0 +1,168 @@
+/*
+ * adummy.c: a dummy ATM driver
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/skbuff.h>
+#include <linux/pci.h>
+#include <linux/errno.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <asm/io.h>
+#include <asm/byteorder.h>
+#include <asm/uaccess.h>
+
+#include <linux/atmdev.h>
+#include <linux/atm.h>
+#include <linux/sonet.h>
+
+/* version definition */
+
+#define DRV_VERSION "1.0"
+
+#define DEV_LABEL "adummy"
+
+#define ADUMMY_DEV(dev) ((struct adummy_dev *) (dev)->dev_data)
+
+struct adummy_dev {
+        struct atm_dev *atm_dev;
+
+        struct list_head entry;
+};
+
+/* globals */
+
+static LIST_HEAD(adummy_devs);
+
+static int __init
+adummy_start(struct atm_dev *dev)
+{
+        dev->ci_range.vpi_bits = 4;
+        dev->ci_range.vci_bits = 12;
+
+        return 0;
+}
+
+static int
+adummy_open(struct atm_vcc *vcc)
+{
+        short vpi = vcc->vpi;
+        int vci = vcc->vci;
+
+        if (vci == ATM_VCI_UNSPEC || vpi == ATM_VPI_UNSPEC)
+                return 0;
+
+        set_bit(ATM_VF_ADDR, &vcc->flags);
+        set_bit(ATM_VF_READY, &vcc->flags);
+
+        return 0;
+}
+
+static void
+adummy_close(struct atm_vcc *vcc)
+{
+        clear_bit(ATM_VF_READY, &vcc->flags);
+        clear_bit(ATM_VF_ADDR, &vcc->flags);
+}
+
+static int
+adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
+{
+        if (vcc->pop)
+                vcc->pop(vcc, skb);
+        else
+                dev_kfree_skb_any(skb);
+        atomic_inc(&vcc->stats->tx);
+
+        return 0;
+}
+
+static int
+adummy_proc_read(struct atm_dev *dev, loff_t *pos, char *page)
+{
+        int left = *pos;
+
+        if (!left--)
+                return sprintf(page, "version %s\n", DRV_VERSION);
+
+        return 0;
+}
+
+static struct atmdev_ops adummy_ops =
+{
+        .open =         adummy_open,
+        .close =        adummy_close,   
+        .send =         adummy_send,
+        .proc_read =    adummy_proc_read,
+        .owner =        THIS_MODULE
+};
+
+static int __init adummy_init(void)
+{
+        struct atm_dev *atm_dev;
+        struct adummy_dev *adummy_dev;
+        int err = 0;
+
+        printk(KERN_ERR "adummy: version %s\n", DRV_VERSION);
+
+        adummy_dev = (struct adummy_dev *) kmalloc(sizeof(struct adummy_dev),
+                                                   GFP_KERNEL);
+        if (!adummy_dev) {
+                printk(KERN_ERR DEV_LABEL ": kmalloc() failed\n");
+                err = -ENOMEM;
+                goto out;
+        }
+        memset(adummy_dev, 0, sizeof(struct adummy_dev));
+
+        atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, 0);
+        if (!atm_dev) {
+                printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n");
+                err = -ENODEV;
+                goto out_kfree;
+        }
+
+        adummy_dev->atm_dev = atm_dev;
+        atm_dev->dev_data = adummy_dev;
+
+        if (adummy_start(atm_dev)) {
+                printk(KERN_ERR DEV_LABEL ": adummy_start() failed\n");
+                err = -ENODEV;
+                goto out_unregister;
+        }
+
+        list_add(&adummy_dev->entry, &adummy_devs);
+out:
+        return err;
+
+out_unregister:
+        atm_dev_deregister(atm_dev);
+out_kfree:
+        kfree(adummy_dev);
+        goto out;
+}
+
+static void __exit adummy_cleanup(void)
+{
+        struct adummy_dev *adummy_dev, *next;
+
+        list_for_each_entry_safe(adummy_dev, next, &adummy_devs, entry) {
+                atm_dev_deregister(adummy_dev->atm_dev);
+                kfree(adummy_dev);
+        }
+}
+
+module_init(adummy_init);
+module_exit(adummy_cleanup);
+
+MODULE_AUTHOR("chas williams <chas@cmf.nrl.navy.mil>");
+MODULE_DESCRIPTION("dummy ATM driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/atm/atmdev_init.c b/drivers/atm/atmdev_init.c
deleted file mode 100644
index 0e09e5c28e3f..000000000000
--- a/drivers/atm/atmdev_init.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* drivers/atm/atmdev_init.c - ATM device driver initialization */
- 
-/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
- 
-
-#include <linux/config.h>
-#include <linux/init.h>
-
-
-#ifdef CONFIG_ATM_ZATM
-extern int zatm_detect(void);
-#endif
-#ifdef CONFIG_ATM_AMBASSADOR
-extern int amb_detect(void);
-#endif
-#ifdef CONFIG_ATM_HORIZON
-extern int hrz_detect(void);
-#endif
-#ifdef CONFIG_ATM_FORE200E
-extern int fore200e_detect(void);
-#endif
-#ifdef CONFIG_ATM_LANAI
-extern int lanai_detect(void);
-#endif
-
-
-/*
- * For historical reasons, atmdev_init returns the number of devices found.
- * Note that some detections may not go via atmdev_init (e.g. eni.c), so this
- * number is meaningless.
- */
-
-int __init atmdev_init(void)
-{
-        int devs;
-
-        devs = 0;
-#ifdef CONFIG_ATM_ZATM
-        devs += zatm_detect();
-#endif
-#ifdef CONFIG_ATM_AMBASSADOR
-        devs += amb_detect();
-#endif
-#ifdef CONFIG_ATM_HORIZON
-        devs += hrz_detect();
-#endif
-#ifdef CONFIG_ATM_FORE200E
-        devs += fore200e_detect();
-#endif
-#ifdef CONFIG_ATM_LANAI
-        devs += lanai_detect();
-#endif
-        return devs;
-}
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
index 57f1810fdccd..fc518d85543d 100644
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
@@ -246,10 +246,6 @@ static void atmtcp_c_close(struct atm_vcc *vcc)
 {
         struct atm_dev *atmtcp_dev;
         struct atmtcp_dev_data *dev_data;
-        struct sock *s;
-        struct hlist_node *node;
-        struct atm_vcc *walk;
-        int i;
 
         atmtcp_dev = (struct atm_dev *) vcc->dev_data;
         dev_data = PRIV(atmtcp_dev);
@@ -257,20 +253,8 @@ static void atmtcp_c_close(struct atm_vcc *vcc)
         if (dev_data->persist) return;
         atmtcp_dev->dev_data = NULL;
         kfree(dev_data);
-        shutdown_atm_dev(atmtcp_dev);
+        atm_dev_deregister(atmtcp_dev);
         vcc->dev_data = NULL;
-        read_lock(&vcc_sklist_lock);
-        for(i = 0; i < VCC_HTABLE_SIZE; ++i) {
-                struct hlist_head *head = &vcc_hash[i];
-
-                sk_for_each(s, node, head) {
-                        walk = atm_sk(s);
-                        if (walk->dev != atmtcp_dev)
-                                continue;
-                        wake_up(s->sk_sleep);
-                }
-        }
-        read_unlock(&vcc_sklist_lock);
         module_put(THIS_MODULE);
 }
 
@@ -450,7 +434,7 @@ static int atmtcp_remove_persistent(int itf)
         if (PRIV(dev)->vcc) return 0;
         kfree(dev_data);
         atm_dev_put(dev);
-        shutdown_atm_dev(dev);
+        atm_dev_deregister(dev);
         return 0;
 }
 
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 51ec14787293..69f4c7ce9a63 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -39,7 +39,7 @@
  * o  lanai_change_qos() isn't written yet
  *
  * o  There aren't any ioctl's yet -- I'd like to eventually support
- *    setting loopback and LED modes that way.  (see lanai_ioctl)
+ *    setting loopback and LED modes that way.
  *
  * o  If the segmentation engine or DMA gets shut down we should restart
  *    card as per section 17.0i.  (see lanai_reset)
@@ -305,7 +305,7 @@ struct lanai_dev {
  * vci with their bit set
  */
 static void vci_bitfield_iterate(struct lanai_dev *lanai,
-        /*const*/ unsigned long *lp,
+        const unsigned long *lp,
         void (*func)(struct lanai_dev *,vci_t vci))
 {
         vci_t vci = find_first_bit(lp, NUM_VCI);
@@ -951,7 +951,7 @@ static int __devinit eeprom_read(struct lanai_dev *lanai)
 /* read a big-endian 4-byte value out of eeprom */
 static inline u32 eeprom_be4(const struct lanai_dev *lanai, int address)
 {
-        return be32_to_cpup((u32 *) (&lanai->eeprom[address]));
+        return be32_to_cpup((const u32 *) &lanai->eeprom[address]);
 }
 
 /* Checksum/validate EEPROM contents */
@@ -1160,7 +1160,7 @@ static inline int vcc_tx_space(const struct lanai_vcc *lvcc, int endptr)
 }
 
 /* test if VCC is currently backlogged */
-static inline int vcc_is_backlogged(/*const*/ struct lanai_vcc *lvcc)
+static inline int vcc_is_backlogged(const struct lanai_vcc *lvcc)
 {
         return !skb_queue_empty(&lvcc->tx.backlog);
 }
@@ -1395,7 +1395,8 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
 {
         int size;
         struct sk_buff *skb;
-        /*const*/ u32 *x, *end = &lvcc->rx.buf.start[endptr * 4];
+        const u32 *x;
+        u32 *end = &lvcc->rx.buf.start[endptr * 4];
         int n = ((unsigned long) end) - ((unsigned long) lvcc->rx.buf.ptr);
         if (n < 0)
                 n += lanai_buf_size(&lvcc->rx.buf);
@@ -2111,7 +2112,7 @@ static int lanai_normalize_ci(struct lanai_dev *lanai,
  * shifted by that much as we compute
  *
  */
-static int pcr_to_cbricg(/*const*/ struct atm_qos *qos)
+static int pcr_to_cbricg(const struct atm_qos *qos)
 {
         int rounddown = 0;      /* 1 = Round PCR down, i.e. round ICG _up_ */
         int x, icg, pcr = atm_pcr_goal(&qos->txtp);
@@ -2434,93 +2435,6 @@ static int lanai_open(struct atm_vcc *atmvcc)
         return result;
 }
 
-#if 0
-/* ioctl operations for card */
-/* NOTE: these are all DEBUGGING ONLY currently */
-static int lanai_ioctl(struct atm_dev *atmdev, unsigned int cmd, void __user *arg)
-{
-        int result = 0;
-        struct lanai_dev *lanai = (struct lanai_dev *) atmdev->dev_data;
-        switch(cmd) {
-                case 2106275:
-                        shutdown_atm_dev(atmdev);
-                        return 0;
-                case 2200000: {
-                        unsigned long flags;
-                        spin_lock_irqsave(&lanai->servicelock, flags);
-                        run_service(lanai);
-                        spin_unlock_irqrestore(&lanai->servicelock, flags);
-                        return 0; }
-                case 2200002:
-                        get_statistics(lanai);
-                        return 0;
-                case 2200003: {
-                        unsigned int i;
-                        for (i = 0; i <= 0x5C ; i += 4) {
-                                if (i==0x48) /* Write-only butt reg */
-                                        continue;
-                                printk(KERN_CRIT DEV_LABEL "  0x%02X: "
-                                    "0x%08X\n", i,
-                                    (unsigned int) readl(lanai->base + i));
-                                barrier(); mb();
-                                pcistatus_check(lanai, 0);
-                                barrier(); mb();
-                        }
-                        return 0; }
-                case 2200004: {
-                        u8 b;
-                        u16 w;
-                        u32 dw;
-                        struct pci_dev *pci = lanai->pci;
-                        (void) pci_read_config_word(pci, PCI_VENDOR_ID, &w);
-                        DPRINTK("vendor = 0x%X\n", (unsigned int) w);
-                        (void) pci_read_config_word(pci, PCI_DEVICE_ID, &w);
-                        DPRINTK("device = 0x%X\n", (unsigned int) w);
-                        (void) pci_read_config_word(pci, PCI_COMMAND, &w);
-                        DPRINTK("command = 0x%X\n", (unsigned int) w);
-                        (void) pci_read_config_word(pci, PCI_STATUS, &w);
-                        DPRINTK("status = 0x%X\n", (unsigned int) w);
-                        (void) pci_read_config_dword(pci,
-                            PCI_CLASS_REVISION, &dw);
-                        DPRINTK("class/revision = 0x%X\n", (unsigned int) dw);
-                        (void) pci_read_config_byte(pci,
-                            PCI_CACHE_LINE_SIZE, &b);
-                        DPRINTK("cache line size = 0x%X\n", (unsigned int) b);
-                        (void) pci_read_config_byte(pci, PCI_LATENCY_TIMER, &b);
-                        DPRINTK("latency = %d (0x%X)\n",
-                            (int) b, (unsigned int) b);
-                        (void) pci_read_config_byte(pci, PCI_HEADER_TYPE, &b);
-                        DPRINTK("header type = 0x%X\n", (unsigned int) b);
-                        (void) pci_read_config_byte(pci, PCI_BIST, &b);
-                        DPRINTK("bist = 0x%X\n", (unsigned int) b);
-                        /* skipping a few here */
-                        (void) pci_read_config_byte(pci,
-                            PCI_INTERRUPT_LINE, &b);
-                        DPRINTK("pci_int_line = 0x%X\n", (unsigned int) b);
-                        (void) pci_read_config_byte(pci,
-                            PCI_INTERRUPT_PIN, &b);
-                        DPRINTK("pci_int_pin = 0x%X\n", (unsigned int) b);
-                        (void) pci_read_config_byte(pci, PCI_MIN_GNT, &b);
-                        DPRINTK("min_gnt = 0x%X\n", (unsigned int) b);
-                        (void) pci_read_config_byte(pci, PCI_MAX_LAT, &b);
-                        DPRINTK("max_lat = 0x%X\n", (unsigned int) b); }
-                        return 0;
-#ifdef USE_POWERDOWN
-                case 2200005:
-                        DPRINTK("Coming out of powerdown\n");
-                        lanai->conf1 &= ~CONFIG1_POWERDOWN;
-                        conf1_write(lanai);
-                        return 0;
-#endif
-                default:
-                        result = -ENOIOCTLCMD;
-        }
-        return result;
-}
-#else /* !0 */
-#define lanai_ioctl NULL
-#endif /* 0 */
-
 static int lanai_send(struct atm_vcc *atmvcc, struct sk_buff *skb)
 {
         struct lanai_vcc *lvcc = (struct lanai_vcc *) atmvcc->dev_data;
@@ -2678,7 +2592,6 @@ static const struct atmdev_ops ops = {
         .dev_close      = lanai_dev_close,
         .open           = lanai_open,
         .close          = lanai_close,
-        .ioctl          = lanai_ioctl,
         .getsockopt     = NULL,
         .setsockopt     = NULL,
         .send           = lanai_send,
@@ -2760,6 +2673,7 @@ static void __exit lanai_module_exit(void)
          * gone, so there isn't much to do
          */
         DPRINTK("cleanup_module()\n");
+        pci_unregister_driver(&lanai_driver);
 }
 
 module_init(lanai_module_init);
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index c466739428b2..2e6593e6c1bd 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -879,7 +879,7 @@ static int usbatm_atm_init(struct usbatm_data *instance)
 
  fail:
         instance->atm_dev = NULL;
-        shutdown_atm_dev(atm_dev); /* usbatm_atm_dev_close will eventually be called */
+        atm_dev_deregister(atm_dev); /* usbatm_atm_dev_close will eventually be called */
         return ret;
 }
 
@@ -1164,7 +1164,7 @@ void usbatm_usb_disconnect(struct usb_interface *intf)
 
         /* ATM finalize */
         if (instance->atm_dev)
-                shutdown_atm_dev(instance->atm_dev);
+                atm_dev_deregister(instance->atm_dev);
 
         usbatm_put_instance(instance);  /* taken in usbatm_usb_probe */
 }