Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / scsi / lasi700.c

diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index 25729f3..f0871c3 100644 (file)
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -98,7 +98,7 @@ MODULE_DEVICE_TABLE(parisc, lasi700_ids);
 static int __init
 lasi700_probe(struct parisc_device *dev)
 {
-       unsigned long base = dev->hpa + LASI_SCSI_CORE_OFFSET;
+       unsigned long base = dev->hpa.start + LASI_SCSI_CORE_OFFSET;
        struct NCR_700_Host_Parameters *hostdata;
        struct Scsi_Host *host;
 
@@ -111,8 +111,8 @@ lasi700_probe(struct parisc_device *dev)
        memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
 
        hostdata->dev = &dev->dev;
-       dma_set_mask(&dev->dev, 0xffffffffUL);
-       hostdata->base = base;
+       dma_set_mask(&dev->dev, DMA_32BIT_MASK);
+       hostdata->base = ioremap_nocache(base, 0x100);
        hostdata->differential = 0;
 
        if (dev->id.sversion == LASI_700_SVERSION) {
@@ -125,19 +125,26 @@ lasi700_probe(struct parisc_device *dev)
                hostdata->dmode_extra = DMODE_FC2;
        }
 
-       NCR_700_set_mem_mapped(hostdata);
-
-       host = NCR_700_detect(&lasi700_template, hostdata, &dev->dev,
-                             dev->irq, 7);
+       host = NCR_700_detect(&lasi700_template, hostdata, &dev->dev);
        if (!host)
                goto out_kfree;
+       host->this_id = 7;
+       host->base = base;
+       host->irq = dev->irq;
+       if(request_irq(dev->irq, NCR_700_intr, IRQF_SHARED, "lasi700", host)) {
+               printk(KERN_ERR "lasi700: request_irq failed!\n");
+               goto out_put_host;
+       }
 
        dev_set_drvdata(&dev->dev, host);
        scsi_scan_host(host);
 
        return 0;
 
+ out_put_host:
+       scsi_host_put(host);
  out_kfree:
+       iounmap(hostdata->base);
        kfree(hostdata);
        return -ENODEV;
 }
@@ -152,13 +159,14 @@ lasi700_driver_remove(struct parisc_device *dev)
        scsi_remove_host(host);
        NCR_700_release(host);
        free_irq(host->irq, host);
+       iounmap(hostdata->base);
        kfree(hostdata);
 
        return 0;
 }
 
 static struct parisc_driver lasi700_driver = {
-       .name =         "Lasi SCSI",
+       .name =         "lasi_scsi",
        .id_table =     lasi700_ids,
        .probe =        lasi700_probe,
        .remove =       __devexit_p(lasi700_driver_remove),