Patched in Tegra support.

9 files changed, 40 insertions, 30 deletions

diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
index 3e1172adb37..c454e44cf51 100644
--- a/drivers/scsi/arm/acornscsi.c
+++ b/drivers/scsi/arm/acornscsi.c
@@ -138,6 +138,7 @@
 #include <linux/stringify.h>
 #include <linux/io.h>
 
+#include <asm/system.h>
 #include <asm/ecard.h>
 
 #include "../scsi.h"
@@ -2965,7 +2966,8 @@ static struct scsi_host_template acornscsi_template = {
         .proc_name              = "acornscsi",
 };
 
-static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
+static int __devinit
+acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         AS_Host *ashost;
@@ -3031,7 +3033,7 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         return ret;
 }
 
-static void acornscsi_remove(struct expansion_card *ec)
+static void __devexit acornscsi_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
         AS_Host *ashost = (AS_Host *)host->hostdata;
@@ -3062,7 +3064,7 @@ static const struct ecard_id acornscsi_cids[] = {
 
 static struct ecard_driver acornscsi_driver = {
         .probe          = acornscsi_probe,
-        .remove         = acornscsi_remove,
+        .remove         = __devexit_p(acornscsi_remove),
         .id_table       = acornscsi_cids,
         .drv = {
                 .name           = "acornscsi",
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 9274510294a..a750aa72b8e 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -276,7 +276,8 @@ static struct scsi_host_template arxescsi_template = {
         .proc_name                      = "arxescsi",
 };
 
-static int arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
+static int __devinit
+arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct arxescsi_info *info;
@@ -304,7 +305,7 @@ static int arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         info->base = base;
 
         info->info.scsi.io_base         = base + 0x2000;
-        info->info.scsi.irq             = 0;
+        info->info.scsi.irq             = NO_IRQ;
         info->info.scsi.dma             = NO_DMA;
         info->info.scsi.io_shift        = 5;
         info->info.ifcfg.clockrate      = 24; /* MHz */
@@ -339,7 +340,7 @@ static int arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         return ret;
 }
 
-static void arxescsi_remove(struct expansion_card *ec)
+static void __devexit arxescsi_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
 
@@ -358,7 +359,7 @@ static const struct ecard_id arxescsi_cids[] = {
 
 static struct ecard_driver arxescsi_driver = {
         .probe          = arxescsi_probe,
-        .remove         = arxescsi_remove,
+        .remove         = __devexit_p(arxescsi_remove),
         .id_table       = arxescsi_cids,
         .drv = {
                 .name           = "arxescsi",
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index c93938b246d..a3398fe70a9 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -12,6 +12,7 @@
 
 #include <asm/ecard.h>
 #include <asm/io.h>
+#include <asm/system.h>
 
 #include "../scsi.h"
 #include <scsi/scsi_host.h>
@@ -225,8 +226,8 @@ static struct scsi_host_template cumanascsi_template = {
         .proc_name              = "CumanaSCSI-1",
 };
 
-static int cumanascsi1_probe(struct expansion_card *ec,
-                             const struct ecard_id *id)
+static int __devinit
+cumanascsi1_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         int ret;
@@ -298,7 +299,7 @@ static int cumanascsi1_probe(struct expansion_card *ec,
         return ret;
 }
 
-static void cumanascsi1_remove(struct expansion_card *ec)
+static void __devexit cumanascsi1_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
 
@@ -320,7 +321,7 @@ static const struct ecard_id cumanascsi1_cids[] = {
 
 static struct ecard_driver cumanascsi1_driver = {
         .probe          = cumanascsi1_probe,
-        .remove         = cumanascsi1_remove,
+        .remove         = __devexit_p(cumanascsi1_remove),
         .id_table       = cumanascsi1_cids,
         .drv = {
                 .name           = "cumanascsi1",
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index e3bae93c3c2..547987b8638 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -397,8 +397,8 @@ static struct scsi_host_template cumanascsi2_template = {
         .proc_name                      = "cumanascsi2",
 };
 
-static int cumanascsi2_probe(struct expansion_card *ec,
-                             const struct ecard_id *id)
+static int __devinit
+cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct cumanascsi2_info *info;
@@ -495,7 +495,7 @@ static int cumanascsi2_probe(struct expansion_card *ec,
         return ret;
 }
 
-static void cumanascsi2_remove(struct expansion_card *ec)
+static void __devexit cumanascsi2_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
         struct cumanascsi2_info *info = (struct cumanascsi2_info *)host->hostdata;
@@ -519,7 +519,7 @@ static const struct ecard_id cumanascsi2_cids[] = {
 
 static struct ecard_driver cumanascsi2_driver = {
         .probe          = cumanascsi2_probe,
-        .remove         = cumanascsi2_remove,
+        .remove         = __devexit_p(cumanascsi2_remove),
         .id_table       = cumanascsi2_cids,
         .drv = {
                 .name           = "cumanascsi2",
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 8e36908415e..edfd12b48c2 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -273,7 +273,7 @@ static void eesoxscsi_buffer_out(void *buf, int length, void __iomem *base)
 {
         const void __iomem *reg_fas = base + EESOX_FAS216_OFFSET;
         const void __iomem *reg_dmastat = base + EESOX_DMASTAT;
-        void __iomem *reg_dmadata = base + EESOX_DMADATA;
+        const void __iomem *reg_dmadata = base + EESOX_DMADATA;
 
         do {
                 unsigned int status;
@@ -515,7 +515,8 @@ static struct scsi_host_template eesox_template = {
         .proc_name                      = "eesox",
 };
 
-static int eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
+static int __devinit
+eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct eesoxscsi_info *info;
@@ -616,7 +617,7 @@ static int eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         return ret;
 }
 
-static void eesoxscsi_remove(struct expansion_card *ec)
+static void __devexit eesoxscsi_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
         struct eesoxscsi_info *info = (struct eesoxscsi_info *)host->hostdata;
@@ -642,7 +643,7 @@ static const struct ecard_id eesoxscsi_cids[] = {
 
 static struct ecard_driver eesoxscsi_driver = {
         .probe          = eesoxscsi_probe,
-        .remove         = eesoxscsi_remove,
+        .remove         = __devexit_p(eesoxscsi_remove),
         .id_table       = eesoxscsi_cids,
         .drv = {
                 .name           = "eesoxscsi",
diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index 737554c37d9..e85c40b6e19 100644
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -179,7 +179,6 @@ static void print_SCp(struct scsi_pointer *SCp, const char *prefix, const char *
                 SCp->buffers_residual, suffix);
 }
 
-#ifdef CHECK_STRUCTURE
 static void fas216_dumpinfo(FAS216_Info *info)
 {
         static int used = 0;
@@ -224,6 +223,7 @@ static void fas216_dumpinfo(FAS216_Info *info)
                 info->internal_done, info->magic_end);
 }
 
+#ifdef CHECK_STRUCTURE
 static void __fas216_checkmagic(FAS216_Info *info, const char *func)
 {
         int corruption = 0;
@@ -2176,7 +2176,7 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
         fn = (void (*)(FAS216_Info *, struct scsi_cmnd *, unsigned int))SCpnt->host_scribble;
         fn(info, SCpnt, result);
 
-        if (info->scsi.irq) {
+        if (info->scsi.irq != NO_IRQ) {
                 spin_lock_irqsave(&info->host_lock, flags);
                 if (info->scsi.phase == PHASE_IDLE)
                         fas216_kick(info);
@@ -2276,7 +2276,7 @@ static int fas216_noqueue_command_lck(struct scsi_cmnd *SCpnt,
          * We should only be using this if we don't have an interrupt.
          * Provide some "incentive" to use the queueing code.
          */
-        BUG_ON(info->scsi.irq);
+        BUG_ON(info->scsi.irq != NO_IRQ);
 
         info->internal_done = 0;
         fas216_queue_command_lck(SCpnt, fas216_internal_done);
diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index df2e1b3ddfe..84b7127c012 100644
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -12,6 +12,10 @@
 #ifndef FAS216_H
 #define FAS216_H
 
+#ifndef NO_IRQ
+#define NO_IRQ 255
+#endif
+
 #include <scsi/scsi_eh.h>
 
 #include "queue.h"
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 48facdc1800..849cdf89f7b 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -13,6 +13,7 @@
 
 #include <asm/ecard.h>
 #include <asm/io.h>
+#include <asm/system.h>
 
 #include "../scsi.h"
 #include <scsi/scsi_host.h>
@@ -21,7 +22,6 @@
 /*#define PSEUDO_DMA*/
 
 #define OAKSCSI_PUBLIC_RELEASE 1
-#define DONT_USE_INTR
 
 #define priv(host)                      ((struct NCR5380_hostdata *)(host)->hostdata)
 #define NCR5380_local_declare()         void __iomem *_base
@@ -129,7 +129,8 @@ static struct scsi_host_template oakscsi_template = {
         .proc_name              = "oakscsi",
 };
 
-static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
+static int __devinit
+oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         int ret = -ENOMEM;
@@ -181,7 +182,7 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
         return ret;
 }
 
-static void oakscsi_remove(struct expansion_card *ec)
+static void __devexit oakscsi_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
 
@@ -201,7 +202,7 @@ static const struct ecard_id oakscsi_cids[] = {
 
 static struct ecard_driver oakscsi_driver = {
         .probe          = oakscsi_probe,
-        .remove         = oakscsi_remove,
+        .remove         = __devexit_p(oakscsi_remove),
         .id_table       = oakscsi_cids,
         .drv = {
                 .name           = "oakscsi",
diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 246600b9355..9274c0677b9 100644
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -309,8 +309,8 @@ static struct scsi_host_template powertecscsi_template = {
         .proc_name                      = "powertec",
 };
 
-static int powertecscsi_probe(struct expansion_card *ec,
-                              const struct ecard_id *id)
+static int __devinit
+powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct Scsi_Host *host;
         struct powertec_info *info;
@@ -409,7 +409,7 @@ static int powertecscsi_probe(struct expansion_card *ec,
         return ret;
 }
 
-static void powertecscsi_remove(struct expansion_card *ec)
+static void __devexit powertecscsi_remove(struct expansion_card *ec)
 {
         struct Scsi_Host *host = ecard_get_drvdata(ec);
         struct powertec_info *info = (struct powertec_info *)host->hostdata;
@@ -435,7 +435,7 @@ static const struct ecard_id powertecscsi_cids[] = {
 
 static struct ecard_driver powertecscsi_driver = {
         .probe          = powertecscsi_probe,
-        .remove         = powertecscsi_remove,
+        .remove         = __devexit_p(powertecscsi_remove),
         .id_table       = powertecscsi_cids,
         .drv = {
                 .name           = "powertecscsi",