sparc: Kill EBUS driver layer.

All that remains is the EBUS DMA programming library for
sparc64.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 294 deletions

diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index 88408741c320..77dbf6d45faf 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -1,5 +1,4 @@
-/*
- * ebus.c: PCI to EBus bridge device.
+/* ebus.c: EBUS DMA library code.
  *
  * Copyright (C) 1997  Eddie C. Dost  (ecd@skynet.be)
  * Copyright (C) 1999  David S. Miller (davem@redhat.com)
@@ -9,24 +8,12 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/of_device.h>
 
-#include <asm/system.h>
-#include <asm/page.h>
-#include <asm/ebus.h>
 #include <asm/ebus_dma.h>
-#include <asm/oplib.h>
-#include <asm/prom.h>
-#include <asm/irq.h>
 #include <asm/io.h>
 
-/* EBUS dma library. */
-
 #define EBDMA_CSR       0x00UL  /* Control/Status */
 #define EBDMA_ADDR      0x04UL  /* DMA Address */
 #define EBDMA_COUNT     0x08UL  /* DMA Count */
@@ -268,283 +255,3 @@ void ebus_dma_enable(struct ebus_dma_info *p, int on)
         spin_unlock_irqrestore(&p->lock, flags);
 }
 EXPORT_SYMBOL(ebus_dma_enable);
-
-struct linux_ebus *ebus_chain = NULL;
-
-static inline void *ebus_alloc(size_t size)
-{
-        void *mem;
-
-        mem = kzalloc(size, GFP_ATOMIC);
-        if (!mem)
-                panic("ebus_alloc: out of memory");
-        return mem;
-}
-
-static void __init fill_ebus_child(struct device_node *dp,
-                                   struct linux_ebus_child *dev,
-                                   int non_standard_regs)
-{
-        struct of_device *op;
-        const int *regs;
-        int i, len;
-
-        dev->prom_node = dp;
-        printk(" (%s)", dp->name);
-
-        regs = of_get_property(dp, "reg", &len);
-        if (!regs)
-                dev->num_addrs = 0;
-        else
-                dev->num_addrs = len / sizeof(regs[0]);
-
-        if (non_standard_regs) {
-                /* This is to handle reg properties which are not
-                 * in the parent relative format.  One example are
-                 * children of the i2c device on CompactPCI systems.
-                 *
-                 * So, for such devices we just record the property
-                 * raw in the child resources.
-                 */
-                for (i = 0; i < dev->num_addrs; i++)
-                        dev->resource[i].start = regs[i];
-        } else {
-                for (i = 0; i < dev->num_addrs; i++) {
-                        int rnum = regs[i];
-                        if (rnum >= dev->parent->num_addrs) {
-                                prom_printf("UGH: property for %s was %d, need < %d\n",
-                                            dp->name, len, dev->parent->num_addrs);
-                                prom_halt();
-                        }
-                        dev->resource[i].start = dev->parent->resource[i].start;
-                        dev->resource[i].end = dev->parent->resource[i].end;
-                        dev->resource[i].flags = IORESOURCE_MEM;
-                        dev->resource[i].name = dp->name;
-                }
-        }
-
-        op = of_find_device_by_node(dp);
-        if (!op) {
-                dev->num_irqs = 0;
-        } else {
-                dev->num_irqs = op->num_irqs;
-                for (i = 0; i < dev->num_irqs; i++)
-                        dev->irqs[i] = op->irqs[i];
-        }
-
-        if (!dev->num_irqs) {
-                /*
-                 * Oh, well, some PROMs don't export interrupts
-                 * property to children of EBus devices...
-                 *
-                 * Be smart about PS/2 keyboard and mouse.
-                 */
-                if (!strcmp(dev->parent->prom_node->name, "8042")) {
-                        if (!strcmp(dev->prom_node->name, "kb_ps2")) {
-                                dev->num_irqs = 1;
-                                dev->irqs[0] = dev->parent->irqs[0];
-                        } else {
-                                dev->num_irqs = 1;
-                                dev->irqs[0] = dev->parent->irqs[1];
-                        }
-                }
-        }
-}
-
-static int __init child_regs_nonstandard(struct linux_ebus_device *dev)
-{
-        if (!strcmp(dev->prom_node->name, "i2c") ||
-            !strcmp(dev->prom_node->name, "SUNW,lombus"))
-                return 1;
-        return 0;
-}
-
-static void __init fill_ebus_device(struct device_node *dp, struct linux_ebus_device *dev)
-{
-        struct linux_ebus_child *child;
-        struct dev_archdata *sd;
-        struct of_device *op;
-        int i, len;
-
-        dev->prom_node = dp;
-
-        printk(" [%s", dp->name);
-
-        op = of_find_device_by_node(dp);
-        if (!op) {
-                dev->num_addrs = 0;
-                dev->num_irqs = 0;
-        } else {
-                const int *regs = of_get_property(dp, "reg", &len);
-
-                if (!regs)
-                        len = 0;
-                dev->num_addrs = len / sizeof(struct linux_prom_registers);
-
-                for (i = 0; i < dev->num_addrs; i++)
-                        memcpy(&dev->resource[i],
-                               &op->resource[i],
-                               sizeof(struct resource));
-
-                dev->num_irqs = op->num_irqs;
-                for (i = 0; i < dev->num_irqs; i++)
-                        dev->irqs[i] = op->irqs[i];
-        }
-
-        sd = &dev->ofdev.dev.archdata;
-        sd->prom_node = dp;
-        sd->op = &dev->ofdev;
-        sd->iommu = dev->bus->ofdev.dev.parent->archdata.iommu;
-        sd->stc = dev->bus->ofdev.dev.parent->archdata.stc;
-        sd->numa_node = dev->bus->ofdev.dev.parent->archdata.numa_node;
-
-        dev->ofdev.node = dp;
-        dev->ofdev.dev.parent = &dev->bus->ofdev.dev;
-        dev->ofdev.dev.bus = &ebus_bus_type;
-        dev_set_name(&dev->ofdev.dev, "ebus[%08x]", dp->node);
-
-        /* Register with core */
-        if (of_device_register(&dev->ofdev) != 0)
-                printk(KERN_DEBUG "ebus: device registration error for %s!\n",
-                       dp->path_component_name);
-
-        dp = dp->child;
-        if (dp) {
-                printk(" ->");
-                dev->children = ebus_alloc(sizeof(struct linux_ebus_child));
-
-                child = dev->children;
-                child->next = NULL;
-                child->parent = dev;
-                child->bus = dev->bus;
-                fill_ebus_child(dp, child,
-                                child_regs_nonstandard(dev));
-
-                while ((dp = dp->sibling) != NULL) {
-                        child->next = ebus_alloc(sizeof(struct linux_ebus_child));
-
-                        child = child->next;
-                        child->next = NULL;
-                        child->parent = dev;
-                        child->bus = dev->bus;
-                        fill_ebus_child(dp, child,
-                                        child_regs_nonstandard(dev));
-                }
-        }
-        printk("]");
-}
-
-static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p)
-{
-        struct pci_dev *pdev = start;
-
-        while ((pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev)))
-                if (pdev->device == PCI_DEVICE_ID_SUN_EBUS ||
-                        pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)
-                        break;
-
-        *is_rio_p = !!(pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS));
-
-        return pdev;
-}
-
-void __init ebus_init(void)
-{
-        struct linux_ebus_device *dev;
-        struct linux_ebus *ebus;
-        struct pci_dev *pdev;
-        struct device_node *dp;
-        int is_rio;
-        int num_ebus = 0;
-
-        pdev = find_next_ebus(NULL, &is_rio);
-        if (!pdev) {
-                printk("ebus: No EBus's found.\n");
-                return;
-        }
-
-        dp = pci_device_to_OF_node(pdev);
-
-        ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus));
-        ebus->next = NULL;
-        ebus->is_rio = is_rio;
-
-        while (dp) {
-                struct device_node *child;
-
-                /* SUNW,pci-qfe uses four empty ebuses on it.
-                   I think we should not consider them here,
-                   as they have half of the properties this
-                   code expects and once we do PCI hot-plug,
-                   we'd have to tweak with the ebus_chain
-                   in the runtime after initialization. -jj */
-                if (!dp->child) {
-                        pdev = find_next_ebus(pdev, &is_rio);
-                        if (!pdev) {
-                                if (ebus == ebus_chain) {
-                                        ebus_chain = NULL;
-                                        printk("ebus: No EBus's found.\n");
-                                        return;
-                                }
-                                break;
-                        }
-                        ebus->is_rio = is_rio;
-                        dp = pci_device_to_OF_node(pdev);
-                        continue;
-                }
-                printk("ebus%d:", num_ebus);
-
-                ebus->index = num_ebus;
-                ebus->prom_node = dp;
-                ebus->self = pdev;
-
-                ebus->ofdev.node = dp;
-                ebus->ofdev.dev.parent = &pdev->dev;
-                ebus->ofdev.dev.bus = &ebus_bus_type;
-                dev_set_name(&ebus->ofdev.dev, "ebus%d", num_ebus);
-
-                /* Register with core */
-                if (of_device_register(&ebus->ofdev) != 0)
-                        printk(KERN_DEBUG "ebus: device registration error for %s!\n",
-                               dp->path_component_name);
-
-
-                child = dp->child;
-                if (!child)
-                        goto next_ebus;
-
-                ebus->devices = ebus_alloc(sizeof(struct linux_ebus_device));
-
-                dev = ebus->devices;
-                dev->next = NULL;
-                dev->children = NULL;
-                dev->bus = ebus;
-                fill_ebus_device(child, dev);
-
-                while ((child = child->sibling) != NULL) {
-                        dev->next = ebus_alloc(sizeof(struct linux_ebus_device));
-
-                        dev = dev->next;
-                        dev->next = NULL;
-                        dev->children = NULL;
-                        dev->bus = ebus;
-                        fill_ebus_device(child, dev);
-                }
-
-        next_ebus:
-                printk("\n");
-
-                pdev = find_next_ebus(pdev, &is_rio);
-                if (!pdev)
-                        break;
-
-                dp = pci_device_to_OF_node(pdev);
-
-                ebus->next = ebus_alloc(sizeof(struct linux_ebus));
-                ebus = ebus->next;
-                ebus->next = NULL;
-                ebus->is_rio = is_rio;
-                ++num_ebus;
-        }
-        pci_dev_put(pdev); /* XXX for the case, when ebusnd is 0, is it OK? */
-}