xen/blkback: Make optional features be really optional.
[linux-2.6.git] / drivers / block / xsysace.c
index 73354b0..1a17e33 100644 (file)
@@ -456,7 +456,7 @@ static inline void ace_fsm_yieldirq(struct ace_device *ace)
 {
        dev_dbg(ace->dev, "ace_fsm_yieldirq()\n");
 
-       if (ace->irq == NO_IRQ)
+       if (!ace->irq)
                /* No IRQ assigned, so need to poll */
                tasklet_schedule(&ace->fsm_tasklet);
        ace->fsm_continue_flag = 0;
@@ -621,7 +621,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
                ace_dump_mem(ace->cf_id, 512);  /* Debug: Dump out disk ID */
 
                if (ace->data_result) {
-                       /* Error occured, disable the disk */
+                       /* Error occurred, disable the disk */
                        ace->media_change = 1;
                        set_capacity(ace->gd, 0);
                        dev_err(ace->dev, "error fetching CF id (%i)\n",
@@ -801,7 +801,7 @@ static int ace_interrupt_checkstate(struct ace_device *ace)
        u32 sreg = ace_in32(ace, ACE_STATUS);
        u16 creg = ace_in(ace, ACE_CTRL);
 
-       /* Check for error occurance */
+       /* Check for error occurrence */
        if ((sreg & (ACE_STATUS_CFGERROR | ACE_STATUS_CFCERROR)) &&
            (creg & ACE_CTRL_ERRORIRQ)) {
                dev_err(ace->dev, "transfer failure\n");
@@ -1005,7 +1005,6 @@ static int __devinit ace_setup(struct ace_device *ace)
        ace->gd->major = ace_major;
        ace->gd->first_minor = ace->id * ACE_NUM_MINORS;
        ace->gd->fops = &ace_fops;
-       ace->gd->events = DISK_EVENT_MEDIA_CHANGE;
        ace->gd->queue = ace->queue;
        ace->gd->private_data = ace;
        snprintf(ace->gd->disk_name, 32, "xs%c", ace->id + 'a');
@@ -1035,12 +1034,12 @@ static int __devinit ace_setup(struct ace_device *ace)
                ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ);
 
        /* Now we can hook up the irq handler */
-       if (ace->irq != NO_IRQ) {
+       if (ace->irq) {
                rc = request_irq(ace->irq, ace_interrupt, 0, "systemace", ace);
                if (rc) {
                        /* Failure - fall back to polled mode */
                        dev_err(ace->dev, "request_irq failed\n");
-                       ace->irq = NO_IRQ;
+                       ace->irq = 0;
                }
        }
 
@@ -1087,7 +1086,7 @@ static void __devexit ace_teardown(struct ace_device *ace)
 
        tasklet_kill(&ace->fsm_tasklet);
 
-       if (ace->irq != NO_IRQ)
+       if (ace->irq)
                free_irq(ace->irq, ace);
 
        iounmap(ace->baseaddr);
@@ -1156,12 +1155,19 @@ static int __devinit ace_probe(struct platform_device *dev)
 {
        resource_size_t physaddr = 0;
        int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */
-       int id = dev->id;
-       int irq = NO_IRQ;
+       u32 id = dev->id;
+       int irq = 0;
        int i;
 
        dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);
 
+       /* device id and bus width */
+       of_property_read_u32(dev->dev.of_node, "port-number", &id);
+       if (id < 0)
+               id = 0;
+       if (of_find_property(dev->dev.of_node, "8-bit", NULL))
+               bus_width = ACE_BUS_WIDTH_8;
+
        for (i = 0; i < dev->num_resources; i++) {
                if (dev->resource[i].flags & IORESOURCE_MEM)
                        physaddr = dev->resource[i].start;
@@ -1169,7 +1175,7 @@ static int __devinit ace_probe(struct platform_device *dev)
                        irq = dev->resource[i].start;
        }
 
-       /* Call the bus-independant setup code */
+       /* Call the bus-independent setup code */
        return ace_alloc(&dev->dev, id, physaddr, irq, bus_width);
 }
 
@@ -1182,57 +1188,7 @@ static int __devexit ace_remove(struct platform_device *dev)
        return 0;
 }
 
-static struct platform_driver ace_platform_driver = {
-       .probe = ace_probe,
-       .remove = __devexit_p(ace_remove),
-       .driver = {
-               .owner = THIS_MODULE,
-               .name = "xsysace",
-       },
-};
-
-/* ---------------------------------------------------------------------
- * OF_Platform Bus Support
- */
-
 #if defined(CONFIG_OF)
-static int __devinit ace_of_probe(struct platform_device *op)
-{
-       struct resource res;
-       resource_size_t physaddr;
-       const u32 *id;
-       int irq, bus_width, rc;
-
-       /* device id */
-       id = of_get_property(op->dev.of_node, "port-number", NULL);
-
-       /* physaddr */
-       rc = of_address_to_resource(op->dev.of_node, 0, &res);
-       if (rc) {
-               dev_err(&op->dev, "invalid address\n");
-               return rc;
-       }
-       physaddr = res.start;
-
-       /* irq */
-       irq = irq_of_parse_and_map(op->dev.of_node, 0);
-
-       /* bus width */
-       bus_width = ACE_BUS_WIDTH_16;
-       if (of_find_property(op->dev.of_node, "8-bit", NULL))
-               bus_width = ACE_BUS_WIDTH_8;
-
-       /* Call the bus-independant setup code */
-       return ace_alloc(&op->dev, id ? be32_to_cpup(id) : 0,
-                                               physaddr, irq, bus_width);
-}
-
-static int __devexit ace_of_remove(struct platform_device *op)
-{
-       ace_free(&op->dev);
-       return 0;
-}
-
 /* Match table for of_platform binding */
 static const struct of_device_id ace_of_match[] __devinitconst = {
        { .compatible = "xlnx,opb-sysace-1.00.b", },
@@ -1242,34 +1198,20 @@ static const struct of_device_id ace_of_match[] __devinitconst = {
        {},
 };
 MODULE_DEVICE_TABLE(of, ace_of_match);
+#else /* CONFIG_OF */
+#define ace_of_match NULL
+#endif /* CONFIG_OF */
 
-static struct platform_driver ace_of_driver = {
-       .probe = ace_of_probe,
-       .remove = __devexit_p(ace_of_remove),
+static struct platform_driver ace_platform_driver = {
+       .probe = ace_probe,
+       .remove = __devexit_p(ace_remove),
        .driver = {
-               .name = "xsysace",
                .owner = THIS_MODULE,
+               .name = "xsysace",
                .of_match_table = ace_of_match,
        },
 };
 
-/* Registration helpers to keep the number of #ifdefs to a minimum */
-static inline int __init ace_of_register(void)
-{
-       pr_debug("xsysace: registering OF binding\n");
-       return platform_driver_register(&ace_of_driver);
-}
-
-static inline void __exit ace_of_unregister(void)
-{
-       platform_driver_unregister(&ace_of_driver);
-}
-#else /* CONFIG_OF */
-/* CONFIG_OF not enabled; do nothing helpers */
-static inline int __init ace_of_register(void) { return 0; }
-static inline void __exit ace_of_unregister(void) { }
-#endif /* CONFIG_OF */
-
 /* ---------------------------------------------------------------------
  * Module init/exit routines
  */
@@ -1283,11 +1225,6 @@ static int __init ace_init(void)
                goto err_blk;
        }
 
-       rc = ace_of_register();
-       if (rc)
-               goto err_of;
-
-       pr_debug("xsysace: registering platform binding\n");
        rc = platform_driver_register(&ace_platform_driver);
        if (rc)
                goto err_plat;
@@ -1296,21 +1233,17 @@ static int __init ace_init(void)
        return 0;
 
 err_plat:
-       ace_of_unregister();
-err_of:
        unregister_blkdev(ace_major, "xsysace");
 err_blk:
        printk(KERN_ERR "xsysace: registration failed; err=%i\n", rc);
        return rc;
 }
+module_init(ace_init);
 
 static void __exit ace_exit(void)
 {
        pr_debug("Unregistering Xilinx SystemACE driver\n");
        platform_driver_unregister(&ace_platform_driver);
-       ace_of_unregister();
        unregister_blkdev(ace_major, "xsysace");
 }
-
-module_init(ace_init);
 module_exit(ace_exit);