Remove the HOSTNO macro that is peculiar to atari_NCR5380.c and
contributes to the problem of divergence of the NCR5380 core drivers.
Keep NCR5380.c in sync.
Signed-off-by: Finn Thain <fth...@telegraphics.com.au>
---
drivers/scsi/NCR5380.c | 17 +++++++++--------
drivers/scsi/atari_NCR5380.c | 23 +++++++++--------------
2 files changed, 18 insertions(+), 22 deletions(-)
Index: linux/drivers/scsi/atari_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/atari_NCR5380.c 2015-11-18 19:34:30.000000000
+1100
+++ linux/drivers/scsi/atari_NCR5380.c 2015-11-18 19:34:32.000000000 +1100
@@ -580,12 +580,12 @@ static void NCR5380_print_phase(struct S
status = NCR5380_read(STATUS_REG);
if (!(status & SR_REQ))
- printk(KERN_DEBUG "scsi%d: REQ not asserted, phase unknown.\n",
HOSTNO);
+ shost_printk(KERN_DEBUG, instance, "REQ not asserted, phase
unknown.\n");
else {
for (i = 0; (phases[i].value != PHASE_UNKNOWN) &&
(phases[i].value != (status & PHASE_MASK)); ++i)
;
- printk(KERN_DEBUG "scsi%d: phase %s\n", HOSTNO, phases[i].name);
+ shost_printk(KERN_DEBUG, instance, "phase %s\n",
phases[i].name);
}
}
@@ -1437,8 +1437,7 @@ static struct scsi_cmnd *NCR5380_select(
NCR5380_reselect(instance);
if (!hostdata->connected)
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
- printk(KERN_ERR "scsi%d: reselection after won arbitration?\n",
- HOSTNO);
+ shost_printk(KERN_ERR, instance, "reselection after won
arbitration?\n");
goto out;
}
@@ -1966,8 +1965,7 @@ static void NCR5380_information_transfer
switch (phase) {
case PHASE_DATAOUT:
#if (NDEBUG & NDEBUG_NO_DATAOUT)
- printk("scsi%d: NDEBUG_NO_DATAOUT set,
attempted DATAOUT "
- "aborted\n", HOSTNO);
+ shost_printk(KERN_DEBUG, instance,
"NDEBUG_NO_DATAOUT set, attempted DATAOUT aborted\n");
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
@@ -2228,13 +2226,11 @@ static void NCR5380_information_transfer
tmp = 0;
}
} else if (len) {
- printk(KERN_NOTICE "scsi%d:
error receiving "
- "extended message\n",
HOSTNO);
+ shost_printk(KERN_ERR,
instance, "error receiving extended message\n");
tmp = 0;
} else {
- printk(KERN_NOTICE "scsi%d:
extended message "
- "code %02x length %d
is too long\n",
- HOSTNO,
extended_msg[2], extended_msg[1]);
+ shost_printk(KERN_NOTICE,
instance, "extended message code %02x length %d is too long\n",
+ extended_msg[2],
extended_msg[1]);
tmp = 0;
}
@@ -2250,8 +2246,7 @@ static void NCR5380_information_transfer
*/
default:
if (!tmp) {
- printk(KERN_INFO "scsi%d:
rejecting message ",
- instance->host_no);
+ shost_printk(KERN_ERR,
instance, "rejecting message ");
spi_print_msg(extended_msg);
printk("\n");
} else if (tmp != EXTENDED_MESSAGE)
@@ -2300,7 +2295,7 @@ static void NCR5380_information_transfer
cmd->SCp.Status = tmp;
break;
default:
- printk("scsi%d: unknown phase\n", HOSTNO);
+ shost_printk(KERN_ERR, instance, "unknown
phase\n");
NCR5380_dprint(NDEBUG_ANY, instance);
} /* switch(phase) */
} else {
Index: linux/drivers/scsi/NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/NCR5380.c 2015-11-18 19:34:30.000000000 +1100
+++ linux/drivers/scsi/NCR5380.c 2015-11-18 19:34:32.000000000 +1100
@@ -429,10 +429,10 @@ static void NCR5380_print_phase(struct S
status = NCR5380_read(STATUS_REG);
if (!(status & SR_REQ))
- printk("scsi%d : REQ not asserted, phase unknown.\n",
instance->host_no);
+ shost_printk(KERN_DEBUG, instance, "REQ not asserted, phase
unknown.\n");
else {
for (i = 0; (phases[i].value != PHASE_UNKNOWN) &&
(phases[i].value != (status & PHASE_MASK)); ++i);
- printk("scsi%d : phase %s\n", instance->host_no,
phases[i].name);
+ shost_printk(KERN_DEBUG, instance, "phase %s\n",
phases[i].name);
}
}
#endif
@@ -1254,7 +1254,7 @@ static struct scsi_cmnd *NCR5380_select(
NCR5380_reselect(instance);
if (!hostdata->connected)
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
- printk("scsi%d : reselection after won arbitration?\n",
instance->host_no);
+ shost_printk(KERN_ERR, instance, "reselection after won
arbitration?\n");
goto out;
}
@@ -1859,7 +1859,7 @@ static void NCR5380_information_transfer
switch (phase) {
case PHASE_DATAOUT:
#if (NDEBUG & NDEBUG_NO_DATAOUT)
- printk("scsi%d : NDEBUG_NO_DATAOUT set,
attempted DATAOUT aborted\n", instance->host_no);
+ shost_printk(KERN_DEBUG, instance,
"NDEBUG_NO_DATAOUT set, attempted DATAOUT aborted\n");
sink = 1;
do_abort(instance);
cmd->result = DID_ERROR << 16;
@@ -2060,10 +2060,11 @@ static void NCR5380_information_transfer
tmp = 0;
}
} else if (len) {
- printk("scsi%d: error receiving
extended message\n", instance->host_no);
+ shost_printk(KERN_ERR,
instance, "error receiving extended message\n");
tmp = 0;
} else {
- printk("scsi%d: extended
message code %02x length %d is too long\n", instance->host_no, extended_msg[2],
extended_msg[1]);
+ shost_printk(KERN_NOTICE,
instance, "extended message code %02x length %d is too long\n",
+ extended_msg[2],
extended_msg[1]);
tmp = 0;
}
@@ -2079,7 +2080,7 @@ static void NCR5380_information_transfer
*/
default:
if (!tmp) {
- printk("scsi%d: rejecting
message ", instance->host_no);
+ shost_printk(KERN_ERR,
instance, "rejecting message ");
spi_print_msg(extended_msg);
printk("\n");
} else if (tmp != EXTENDED_MESSAGE)
@@ -2125,7 +2126,7 @@ static void NCR5380_information_transfer
cmd->SCp.Status = tmp;
break;
default:
- printk("scsi%d : unknown phase\n",
instance->host_no);
+ shost_printk(KERN_ERR, instance, "unknown
phase\n");
NCR5380_dprint(NDEBUG_ANY, instance);
} /* switch(phase) */
} else {
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
