Patched in Tegra support.

1 files changed, 15 insertions, 14 deletions

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 1f38643173c..fb1975d82a7 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -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)
+        if (ace->irq == NO_IRQ)
                 /* No IRQ assigned, so need to poll */
                 tasklet_schedule(&ace->fsm_tasklet);
         ace->fsm_continue_flag = 0;
@@ -961,7 +961,7 @@ static const struct block_device_operations ace_fops = {
 /* --------------------------------------------------------------------
  * SystemACE device setup/teardown code
  */
-static int ace_setup(struct ace_device *ace)
+static int __devinit ace_setup(struct ace_device *ace)
 {
         u16 version;
         u16 val;
@@ -1034,12 +1034,12 @@ static int ace_setup(struct ace_device *ace)
                 ACE_CTRL_DATABUFRDYIRQ | ACE_CTRL_ERRORIRQ);
 
         /* Now we can hook up the irq handler */
-        if (ace->irq) {
+        if (ace->irq != NO_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 = 0;
+                        ace->irq = NO_IRQ;
                 }
         }
 
@@ -1074,7 +1074,7 @@ err_ioremap:
         return -ENOMEM;
 }
 
-static void ace_teardown(struct ace_device *ace)
+static void __devexit ace_teardown(struct ace_device *ace)
 {
         if (ace->gd) {
                 del_gendisk(ace->gd);
@@ -1086,14 +1086,15 @@ static void ace_teardown(struct ace_device *ace)
 
         tasklet_kill(&ace->fsm_tasklet);
 
-        if (ace->irq)
+        if (ace->irq != NO_IRQ)
                 free_irq(ace->irq, ace);
 
         iounmap(ace->baseaddr);
 }
 
-static int ace_alloc(struct device *dev, int id, resource_size_t physaddr,
-                     int irq, int bus_width)
+static int __devinit
+ace_alloc(struct device *dev, int id, resource_size_t physaddr,
+          int irq, int bus_width)
 {
         struct ace_device *ace;
         int rc;
@@ -1134,7 +1135,7 @@ err_noreg:
         return rc;
 }
 
-static void ace_free(struct device *dev)
+static void __devexit ace_free(struct device *dev)
 {
         struct ace_device *ace = dev_get_drvdata(dev);
         dev_dbg(dev, "ace_free(%p)\n", dev);
@@ -1150,12 +1151,12 @@ static void ace_free(struct device *dev)
  * Platform Bus Support
  */
 
-static int ace_probe(struct platform_device *dev)
+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 */
         u32 id = dev->id;
-        int irq = 0;
+        int irq = NO_IRQ;
         int i;
 
         dev_dbg(&dev->dev, "ace_probe(%p)\n", dev);
@@ -1181,7 +1182,7 @@ static int ace_probe(struct platform_device *dev)
 /*
  * Platform bus remove() method
  */
-static int ace_remove(struct platform_device *dev)
+static int __devexit ace_remove(struct platform_device *dev)
 {
         ace_free(&dev->dev);
         return 0;
@@ -1189,7 +1190,7 @@ static int ace_remove(struct platform_device *dev)
 
 #if defined(CONFIG_OF)
 /* Match table for of_platform binding */
-static const struct of_device_id ace_of_match[] = {
+static const struct of_device_id ace_of_match[] __devinitconst = {
         { .compatible = "xlnx,opb-sysace-1.00.b", },
         { .compatible = "xlnx,opb-sysace-1.00.c", },
         { .compatible = "xlnx,xps-sysace-1.00.a", },
@@ -1203,7 +1204,7 @@ MODULE_DEVICE_TABLE(of, ace_of_match);
 
 static struct platform_driver ace_platform_driver = {
         .probe = ace_probe,
-        .remove = ace_remove,
+        .remove = __devexit_p(ace_remove),
         .driver = {
                 .owner = THIS_MODULE,
                 .name = "xsysace",