diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-31 01:15:54 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-09 14:13:17 -0400 |
commit | dd7ab71bb3b4dad7fa1c4fd89706d6870991cfe6 (patch) | |
tree | 7d222384c4c958d89ac755a70261c0a4f6071419 /drivers/scsi/arm | |
parent | b7654914bb8059a9817f32f4c4d0e7f75a08b78a (diff) |
NCR5830: switch to ->show_info()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/scsi/arm')
-rw-r--r-- | drivers/scsi/arm/cumana_1.c | 1 | ||||
-rw-r--r-- | drivers/scsi/arm/oak.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c index c93938b246d5..b679778376c5 100644 --- a/drivers/scsi/arm/cumana_1.c +++ b/drivers/scsi/arm/cumana_1.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #define NCR5380_write(reg, value) cumanascsi_write(_instance, reg, value) | 30 | #define NCR5380_write(reg, value) cumanascsi_write(_instance, reg, value) |
31 | #define NCR5380_intr cumanascsi_intr | 31 | #define NCR5380_intr cumanascsi_intr |
32 | #define NCR5380_queue_command cumanascsi_queue_command | 32 | #define NCR5380_queue_command cumanascsi_queue_command |
33 | #define NCR5380_proc_info cumanascsi_proc_info | ||
34 | 33 | ||
35 | #define NCR5380_implementation_fields \ | 34 | #define NCR5380_implementation_fields \ |
36 | unsigned ctrl; \ | 35 | unsigned ctrl; \ |
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c index 48facdc18002..4266eef8aca1 100644 --- a/drivers/scsi/arm/oak.c +++ b/drivers/scsi/arm/oak.c | |||
@@ -31,7 +31,8 @@ | |||
31 | #define NCR5380_write(reg, value) writeb(value, _base + ((reg) << 2)) | 31 | #define NCR5380_write(reg, value) writeb(value, _base + ((reg) << 2)) |
32 | #define NCR5380_intr oakscsi_intr | 32 | #define NCR5380_intr oakscsi_intr |
33 | #define NCR5380_queue_command oakscsi_queue_command | 33 | #define NCR5380_queue_command oakscsi_queue_command |
34 | #define NCR5380_proc_info oakscsi_proc_info | 34 | #define NCR5380_show_info oakscsi_show_info |
35 | #define NCR5380_write_info oakscsi_write_info | ||
35 | 36 | ||
36 | #define NCR5380_implementation_fields \ | 37 | #define NCR5380_implementation_fields \ |
37 | void __iomem *base | 38 | void __iomem *base |
@@ -115,7 +116,8 @@ printk("reading %p len %d\n", addr, len); | |||
115 | 116 | ||
116 | static struct scsi_host_template oakscsi_template = { | 117 | static struct scsi_host_template oakscsi_template = { |
117 | .module = THIS_MODULE, | 118 | .module = THIS_MODULE, |
118 | .proc_info = oakscsi_proc_info, | 119 | .show_info = oakscsi_show_info, |
120 | .write_info = oakscsi_write_info, | ||
119 | .name = "Oak 16-bit SCSI", | 121 | .name = "Oak 16-bit SCSI", |
120 | .info = oakscsi_info, | 122 | .info = oakscsi_info, |
121 | .queuecommand = oakscsi_queue_command, | 123 | .queuecommand = oakscsi_queue_command, |