diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2016-01-03 16:05:53 +1100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-01-06 21:43:05 -0500 |
| commit | dbb6b350695186b340e621f5edf4c31420f9ab23 (patch) | |
| tree | 92103239e895bdfc961dd7c3df84ee2218c8be69 /drivers/scsi/NCR5380.c | |
| parent | e5c3fddfaa066e440315e713ddf8b60e9ac48cf7 (diff) | |
| download | linux-dbb6b350695186b340e621f5edf4c31420f9ab23.tar.bz2 | |
ncr5380: Remove H_NO macro and introduce dsprintk
Replace all H_NO and some HOSTNO macros (both peculiar to atari_NCR5380.c)
with a new dsprintk macro that's more useful and more consistent. The new
macro avoids a lot of boilerplate in new code in subsequent patches. Keep
NCR5380.c in sync. Remaining HOSTNO macros are removed as side-effects
of subsequent patches.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/NCR5380.c')
| -rw-r--r-- | drivers/scsi/NCR5380.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 2ac01d86d330..54939836ca53 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -755,7 +755,7 @@ static int NCR5380_queue_command(struct Scsi_Host *instance, switch (cmd->cmnd[0]) { case WRITE_6: case WRITE_10: - printk("scsi%d : WRITE attempted with NO_WRITE debugging flag set\n", instance->host_no); + shost_printk(KERN_DEBUG, instance, "WRITE attempted with NDEBUG_NO_WRITE set\n"); cmd->result = (DID_ERROR << 16); cmd->scsi_done(cmd); return 0; @@ -790,7 +790,8 @@ static int NCR5380_queue_command(struct Scsi_Host *instance, } spin_unlock_irqrestore(&hostdata->lock, flags); - dprintk(NDEBUG_QUEUES, "scsi%d : command added to %s of queue\n", instance->host_no, (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail"); + dsprintk(NDEBUG_QUEUES, instance, "command %p added to %s of queue\n", + cmd, (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail"); /* Kick off command processing */ queue_work(hostdata->work_q, &hostdata->main_task); @@ -1888,7 +1889,9 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) { cmd->host_scribble = (unsigned char *) hostdata->issue_queue; hostdata->issue_queue = (struct scsi_cmnd *) cmd; - dprintk(NDEBUG_QUEUES, "scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no); + dsprintk(NDEBUG_QUEUES, instance, + "REQUEST SENSE cmd %p added to head of issue queue\n", + cmd); } else { cmd->scsi_done(cmd); } |