Sysace: Move structure allocation from bus binding into common code

Split the determination of device registers/irqs/etc from the actual
allocation and initialization of the device structure.  This cleans
up the code a bit in preparation to add an of_platform bus binding

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index b10447611afdfdd2c33a9b60c7fd262ec5c7cf55..555939bd2d53b0ce012585ddedb497305a5c8972 100644 (file)
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1033,7 +1033,7 @@ static int __devinit ace_setup(struct ace_device *ace)
        if (ace->irq != NO_IRQ)
                free_irq(ace->irq, ace);
       err_ioremap:
-       printk(KERN_INFO "xsysace: error initializing device at 0x%lx\n",
+       dev_info(ace->dev, "xsysace: error initializing device at 0x%lx\n",
               ace->physaddr);
        return -ENOMEM;
 }
@@ -1056,68 +1056,91 @@ static void __devexit ace_teardown(struct ace_device *ace)
        iounmap(ace->baseaddr);
 }
 
-/* ---------------------------------------------------------------------
- * Platform Bus Support
- */
-
-static int __devinit ace_probe(struct platform_device *dev)
+static int __devinit
+ace_alloc(struct device *dev, int id, unsigned long physaddr,
+         int irq, int bus_width)
 {
        struct ace_device *ace;
-       int i;
+       int rc;
+       dev_dbg(dev, "ace_alloc(%p)\n", dev);
 
-       dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);
+       if (!physaddr) {
+               rc = -ENODEV;
+               goto err_noreg;
+       }
 
-       /*
-        * Allocate the ace device structure
-        */
+       /* Allocate and initialize the ace device structure */
        ace = kzalloc(sizeof(struct ace_device), GFP_KERNEL);
-       if (!ace)
+       if (!ace) {
+               rc = -ENOMEM;
                goto err_alloc;
-
-       ace->dev = &dev->dev;
-       ace->id = dev->id;
-       ace->irq = NO_IRQ;
-
-       for (i = 0; i < dev->num_resources; i++) {
-               if (dev->resource[i].flags & IORESOURCE_MEM)
-                       ace->physaddr = dev->resource[i].start;
-               if (dev->resource[i].flags & IORESOURCE_IRQ)
-                       ace->irq = dev->resource[i].start;
        }
 
-       /* FIXME: Should get bus_width from the platform_device struct */
-       ace->bus_width = 1;
-
-       platform_set_drvdata(dev, ace);
+       ace->dev = dev;
+       ace->id = id;
+       ace->physaddr = physaddr;
+       ace->irq = irq;
+       ace->bus_width = bus_width;
 
-       /* Call the bus-independant setup code */
-       if (ace_setup(ace) != 0)
+       /* Call the setup code */
+       if ((rc = ace_setup(ace)) != 0)
                goto err_setup;
 
+       dev_set_drvdata(dev, ace);
        return 0;
 
       err_setup:
-       platform_set_drvdata(dev, NULL);
+       dev_set_drvdata(dev, NULL);
        kfree(ace);
       err_alloc:
-       printk(KERN_ERR "xsysace: could not initialize device\n");
-       return -ENOMEM;
+      err_noreg:
+       dev_err(dev, "could not initialize device, err=%i\n", rc);
+       return rc;
 }
 
-/*
- * Platform bus remove() method
- */
-static int __devexit ace_remove(struct platform_device *dev)
+static void __devexit ace_free(struct device *dev)
 {
-       struct ace_device *ace =  platform_get_drvdata(dev);
-       dev_dbg(&dev->dev, "ace_remove(%p)\n", dev);
+       struct ace_device *ace = dev_get_drvdata(dev);
+       dev_dbg(dev, "ace_free(%p)\n", dev);
 
        if (ace) {
                ace_teardown(ace);
-               platform_set_drvdata(dev, NULL);
+               dev_set_drvdata(dev, NULL);
                kfree(ace);
        }
+}
+
+/* ---------------------------------------------------------------------
+ * Platform Bus Support
+ */
+
+static int __devinit ace_probe(struct platform_device *dev)
+{
+       unsigned long physaddr = 0;
+       int bus_width = 1; /* FIXME: should not be hard coded */
+       int id = dev->id;
+       int irq = NO_IRQ;
+       int i;
+
+       dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);
+
+       for (i = 0; i < dev->num_resources; i++) {
+               if (dev->resource[i].flags & IORESOURCE_MEM)
+                       physaddr = dev->resource[i].start;
+               if (dev->resource[i].flags & IORESOURCE_IRQ)
+                       irq = dev->resource[i].start;
+       }
+
+       /* Call the bus-independant setup code */
+       return ace_alloc(&dev->dev, id, physaddr, irq, bus_width);
+}
 
+/*
+ * Platform bus remove() method
+ */
+static int __devexit ace_remove(struct platform_device *dev)
+{
+       ace_free(&dev->dev);
        return 0;
 }