projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
W1: ds1wm.c msleep for reset
[cascardo/linux.git]
/
drivers
/
scsi
/
zorro7xx.c
diff --git
a/drivers/scsi/zorro7xx.c
b/drivers/scsi/zorro7xx.c
index
5070387
..
64d40a2
100644
(file)
--- a/
drivers/scsi/zorro7xx.c
+++ b/
drivers/scsi/zorro7xx.c
@@
-13,7
+13,10
@@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/zorro.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/zorro.h>
+
+#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/amigaints.h>
+
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport_spi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport_spi.h>
@@
-69,7
+72,7
@@
static struct zorro_device_id zorro7xx_zorro_tbl[] __devinitdata = {
static int __devinit zorro7xx_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent)
{
static int __devinit zorro7xx_init_one(struct zorro_dev *z,
const struct zorro_device_id *ent)
{
- struct Scsi_Host *
host = NULL
;
+ struct Scsi_Host *
host
;
struct NCR_700_Host_Parameters *hostdata;
struct zorro_driver_data *zdd;
unsigned long board, ioaddr;
struct NCR_700_Host_Parameters *hostdata;
struct zorro_driver_data *zdd;
unsigned long board, ioaddr;
@@
-89,14
+92,12
@@
static int __devinit zorro7xx_init_one(struct zorro_dev *z,
return -EBUSY;
}
return -EBUSY;
}
- hostdata = k
m
alloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
- if (
hostdata == NULL
) {
+ hostdata = k
z
alloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
+ if (
!hostdata
) {
printk(KERN_ERR "zorro7xx: Failed to allocate host data\n");
goto out_release;
}
printk(KERN_ERR "zorro7xx: Failed to allocate host data\n");
goto out_release;
}
- memset(hostdata, 0, sizeof(struct NCR_700_Host_Parameters));
-
/* Fill in the required pieces of hostdata */
if (ioaddr > 0x01000000)
hostdata->base = ioremap(ioaddr, zorro_resource_len(z));
/* Fill in the required pieces of hostdata */
if (ioaddr > 0x01000000)
hostdata->base = ioremap(ioaddr, zorro_resource_len(z));
@@
-130,6
+131,7
@@
static int __devinit zorro7xx_init_one(struct zorro_dev *z,
goto out_put_host;
}
goto out_put_host;
}
+ zorro_set_drvdata(z, host);
scsi_scan_host(host);
return 0;
scsi_scan_host(host);
return 0;
@@
-148,7
+150,7
@@
static int __devinit zorro7xx_init_one(struct zorro_dev *z,
static __devexit void zorro7xx_remove_one(struct zorro_dev *z)
{
static __devexit void zorro7xx_remove_one(struct zorro_dev *z)
{
- struct Scsi_Host *host =
dev_to_shost(&z->dev
);
+ struct Scsi_Host *host =
zorro_get_drvdata(z
);
struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
scsi_remove_host(host);
struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
scsi_remove_host(host);