diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2014-11-12 16:11:58 +1100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-20 09:11:08 +0100 |
| commit | 8c32513bd395dc5d382e4883097482567cf8bbc5 (patch) | |
| tree | f603eda2bb0ccf602c88b69e7fb9f6fb6cb947c7 /drivers/scsi/dtc.c | |
| parent | 270ac2c290ad8b83c92ceeed07aaf49ec5807851 (diff) | |
| download | op-kernel-dev-8c32513bd395dc5d382e4883097482567cf8bbc5.zip op-kernel-dev-8c32513bd395dc5d382e4883097482567cf8bbc5.tar.gz | |
ncr5380: Cleanup host info() methods
If the host->info() method is not set, then host->name is used by default.
For atari_scsi, that is exactly the same text. So remove the redundant
info() method. Keep sun3_scsi.c in line with atari_scsi.
Some NCR5380 drivers return an empty string from the info() method
(arm/cumana_1.c arm/oak.c mac_scsi.c) while other drivers use the default
(dmx3191d dtc.c g_NCR5380.c pas16.c t128.c).
Implement a common info() method to replace a lot of duplicated code which
the various drivers use to announce the same information.
This replaces most of the (deprecated) show_info() output and all of the
NCR5380_print_info() output. This also eliminates a bunch of code in
g_NCR5380 which just duplicates functionality in the core driver.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/dtc.c')
| -rw-r--r-- | drivers/scsi/dtc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 2971c7f..2dacf28 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c @@ -281,15 +281,6 @@ found: printk("scsi%d : irq = %d\n", instance->host_no, instance->irq); #endif - printk(KERN_INFO "scsi%d : at 0x%05X", instance->host_no, (int) instance->base); - if (instance->irq == NO_IRQ) - printk(" interrupts disabled"); - else - printk(" irq %d", instance->irq); - printk(" options CAN_QUEUE=%d CMD_PER_LUN=%d release=%d", CAN_QUEUE, CMD_PER_LUN, DTC_PUBLIC_RELEASE); - NCR5380_print_options(instance); - printk("\n"); - ++current_override; ++count; } @@ -461,6 +452,7 @@ static struct scsi_host_template driver_template = { .proc_name = "dtc3x80", .show_info = dtc_show_info, .write_info = dtc_write_info, + .info = dtc_info, .queuecommand = dtc_queue_command, .eh_abort_handler = dtc_abort, .eh_bus_reset_handler = dtc_bus_reset, |
