diff options
author | <jejb@mulgrave.(none)> | 2005-04-03 05:57:48 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic> | 2005-04-16 21:09:43 -0400 |
commit | 56fece20086ebe32bce2c0d74ceadd516b56baae (patch) | |
tree | 3ce88fad34483bfc393feb2ee5f3a7f4b8a17f0b /drivers/scsi/sim710.c | |
parent | e183b06bf0be6c525867476df186d20f8f1efe54 (diff) |
[PATCH] finally fix 53c700 to use the generic iomem infrastructure
This driver has had it's own different infrastructure for doing this for
ages, but it's time it used the common one.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sim710.c')
-rw-r--r-- | drivers/scsi/sim710.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c index 63bf2aecbc57..9171788348c4 100644 --- a/drivers/scsi/sim710.c +++ b/drivers/scsi/sim710.c | |||
@@ -120,11 +120,10 @@ sim710_probe_common(struct device *dev, unsigned long base_addr, | |||
120 | } | 120 | } |
121 | 121 | ||
122 | /* Fill in the three required pieces of hostdata */ | 122 | /* Fill in the three required pieces of hostdata */ |
123 | hostdata->base = base_addr; | 123 | hostdata->base = ioport_map(base_addr, 64); |
124 | hostdata->differential = differential; | 124 | hostdata->differential = differential; |
125 | hostdata->clock = clock; | 125 | hostdata->clock = clock; |
126 | hostdata->chip710 = 1; | 126 | hostdata->chip710 = 1; |
127 | NCR_700_set_io_mapped(hostdata); | ||
128 | 127 | ||
129 | /* and register the chip */ | 128 | /* and register the chip */ |
130 | if((host = NCR_700_detect(&sim710_driver_template, hostdata, dev)) | 129 | if((host = NCR_700_detect(&sim710_driver_template, hostdata, dev)) |
@@ -133,6 +132,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr, | |||
133 | goto out_release; | 132 | goto out_release; |
134 | } | 133 | } |
135 | host->this_id = scsi_id; | 134 | host->this_id = scsi_id; |
135 | host->base = base_addr; | ||
136 | host->irq = irq; | 136 | host->irq = irq; |
137 | if (request_irq(irq, NCR_700_intr, SA_SHIRQ, "sim710", host)) { | 137 | if (request_irq(irq, NCR_700_intr, SA_SHIRQ, "sim710", host)) { |
138 | printk(KERN_ERR "sim710: request_irq failed\n"); | 138 | printk(KERN_ERR "sim710: request_irq failed\n"); |
@@ -164,6 +164,7 @@ sim710_device_remove(struct device *dev) | |||
164 | NCR_700_release(host); | 164 | NCR_700_release(host); |
165 | kfree(hostdata); | 165 | kfree(hostdata); |
166 | free_irq(host->irq, host); | 166 | free_irq(host->irq, host); |
167 | release_region(host->base, 64); | ||
167 | return 0; | 168 | return 0; |
168 | } | 169 | } |
169 | 170 | ||