git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC
[safe/jmp/linux-2.6]
/
drivers
/
scsi
/
sim710.c
diff --git
a/drivers/scsi/sim710.c
b/drivers/scsi/sim710.c
index
d63d229
..
6dc8b84
100644
(file)
--- a/
drivers/scsi/sim710.c
+++ b/
drivers/scsi/sim710.c
@@
-102,7
+102,7
@@
sim710_probe_common(struct device *dev, unsigned long base_addr,
struct NCR_700_Host_Parameters *hostdata =
kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
struct NCR_700_Host_Parameters *hostdata =
kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
- printk(KERN_NOTICE "sim710: %s\n", dev
->bus_id
);
+ printk(KERN_NOTICE "sim710: %s\n", dev
_name(dev)
);
printk(KERN_NOTICE "sim710: irq = %d, clock = %d, base = 0x%lx, scsi_id = %d\n",
irq, clock, base_addr, scsi_id);
printk(KERN_NOTICE "sim710: irq = %d, clock = %d, base = 0x%lx, scsi_id = %d\n",
irq, clock, base_addr, scsi_id);
@@
-305,7
+305,7
@@
sim710_eisa_probe(struct device *dev)
scsi_id = ffs(val) - 1;
if(scsi_id > 7 || (val & ~(1<<scsi_id)) != 0) {
scsi_id = ffs(val) - 1;
if(scsi_id > 7 || (val & ~(1<<scsi_id)) != 0) {
- printk(KERN_ERR "sim710.c, EISA card %s has incorrect scsi_id, setting to 7\n", dev
->bus_id
);
+ printk(KERN_ERR "sim710.c, EISA card %s has incorrect scsi_id, setting to 7\n", dev
_name(dev)
);
scsi_id = 7;
}
} else {
scsi_id = 7;
}
} else {