Skip to content

L
linux
Commit 8ad3a593 authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files
Options

scsi/NCR5380: adopt NCR5380_dprint() and NCR5380_dprint_phase() 

All NCR5380 drivers already include the NCR5380.h header. Better to
adopt those macros rather than have three variations on them.

Moreover, the macros in NCR5380.h are preferable anyway: the atari_NCR5380
and sun3_NCR5380 versions are inflexible. For example, they can't accomodate
NCR5380_dprint(NDEBUG_MAIN | NDEBUG_QUEUES, ...)

Replace the NCR_PRINT* macros from atari_NCR5380.h and sun3_NCR5380.h with
the equivalent macros from NCR5380.h.
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarSam Creasey <sammy@sammy.net>
Acked-by: default avatarMichael Schmitz <schmitz@debian.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 52a6a1cb
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
drivers/scsi/atari_NCR5380.c
View file @ 8ad3a593
...@@ -739,8 +739,8 @@ static void NCR5380_print_status(struct Scsi_Host *instance) ...@@ -739,8 +739,8 @@ static void NCR5380_print_status(struct Scsi_Host *instance)
Scsi_Cmnd *ptr; Scsi_Cmnd *ptr;
unsigned long flags; unsigned long flags;
NCR_PRINT(NDEBUG_ANY); NCR5380_dprint(NDEBUG_ANY, instance);
NCR_PRINT_PHASE(NDEBUG_ANY); NCR5380_dprint_phase(NDEBUG_ANY, instance);
hostdata = (struct NCR5380_hostdata *)instance->hostdata; hostdata = (struct NCR5380_hostdata *)instance->hostdata;
...@@ -1268,7 +1268,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id) ...@@ -1268,7 +1268,7 @@ static irqreturn_t NCR5380_intr(int irq, void *dev_id)
INT_PRINTK("scsi%d: BASR=%02x\n", HOSTNO, basr); INT_PRINTK("scsi%d: BASR=%02x\n", HOSTNO, basr);
/* dispatch to appropriate routine if found and done=0 */ /* dispatch to appropriate routine if found and done=0 */
if (basr & BASR_IRQ) { if (basr & BASR_IRQ) {
NCR_PRINT(NDEBUG_INTR); NCR5380_dprint(NDEBUG_INTR, instance);
if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) { if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {
done = 0; done = 0;
ENABLE_IRQ(); ENABLE_IRQ();
...@@ -1396,7 +1396,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag) ...@@ -1396,7 +1396,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag)
unsigned long flags; unsigned long flags;
hostdata->restart_select = 0; hostdata->restart_select = 0;
NCR_PRINT(NDEBUG_ARBITRATION); NCR5380_dprint(NDEBUG_ARBITRATION, instance);
ARB_PRINTK("scsi%d: starting arbitration, id = %d\n", HOSTNO, ARB_PRINTK("scsi%d: starting arbitration, id = %d\n", HOSTNO,
instance->this_id); instance->this_id);
...@@ -1617,7 +1617,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag) ...@@ -1617,7 +1617,7 @@ static int NCR5380_select(struct Scsi_Host *instance, Scsi_Cmnd *cmd, int tag)
printk(KERN_ERR "scsi%d: weirdness\n", HOSTNO); printk(KERN_ERR "scsi%d: weirdness\n", HOSTNO);
if (hostdata->restart_select) if (hostdata->restart_select)
printk(KERN_NOTICE "\trestart select\n"); printk(KERN_NOTICE "\trestart select\n");
NCR_PRINT(NDEBUG_ANY); NCR5380_dprint(NDEBUG_ANY, instance);
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
return -1; return -1;
} }
...@@ -1742,7 +1742,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, ...@@ -1742,7 +1742,7 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance,
/* Check for phase mismatch */ /* Check for phase mismatch */
if ((tmp & PHASE_MASK) != p) { if ((tmp & PHASE_MASK) != p) {
PIO_PRINTK("scsi%d: phase mismatch\n", HOSTNO); PIO_PRINTK("scsi%d: phase mismatch\n", HOSTNO);
NCR_PRINT_PHASE(NDEBUG_PIO); NCR5380_dprint_phase(NDEBUG_PIO, instance);
break; break;
} }
...@@ -1764,18 +1764,18 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance, ...@@ -1764,18 +1764,18 @@ static int NCR5380_transfer_pio(struct Scsi_Host *instance,
if (!(p & SR_IO)) { if (!(p & SR_IO)) {
if (!((p & SR_MSG) && c > 1)) { if (!((p & SR_MSG) && c > 1)) {
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_DATA);
NCR_PRINT(NDEBUG_PIO); NCR5380_dprint(NDEBUG_PIO, instance);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
ICR_ASSERT_DATA | ICR_ASSERT_ACK); ICR_ASSERT_DATA | ICR_ASSERT_ACK);
} else { } else {
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
ICR_ASSERT_DATA | ICR_ASSERT_ATN); ICR_ASSERT_DATA | ICR_ASSERT_ATN);
NCR_PRINT(NDEBUG_PIO); NCR5380_dprint(NDEBUG_PIO, instance);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_ACK); ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_ACK);
} }
} else { } else {
NCR_PRINT(NDEBUG_PIO); NCR5380_dprint(NDEBUG_PIO, instance);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ACK); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ACK);
} }
...@@ -1997,7 +1997,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -1997,7 +1997,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
phase = (tmp & PHASE_MASK); phase = (tmp & PHASE_MASK);
if (phase != old_phase) { if (phase != old_phase) {
old_phase = phase; old_phase = phase;
NCR_PRINT_PHASE(NDEBUG_INFORMATION); NCR5380_dprint_phase(NDEBUG_INFORMATION, instance);
} }
if (sink && (phase != PHASE_MSGOUT)) { if (sink && (phase != PHASE_MSGOUT)) {
...@@ -2451,7 +2451,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) ...@@ -2451,7 +2451,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
break; break;
default: default:
printk("scsi%d: unknown phase\n", HOSTNO); printk("scsi%d: unknown phase\n", HOSTNO);
NCR_PRINT(NDEBUG_ANY); NCR5380_dprint(NDEBUG_ANY, instance);
} /* switch(phase) */ } /* switch(phase) */
} /* if (tmp * SR_REQ) */ } /* if (tmp * SR_REQ) */
} /* while (1) */ } /* while (1) */
......
drivers/scsi/sun3_NCR5380.c
View file @ 8ad3a593
...@@ -681,8 +681,8 @@ static void NCR5380_print_status(struct Scsi_Host *instance) ...@@ -681,8 +681,8 @@ static void NCR5380_print_status(struct Scsi_Host *instance)
Scsi_Cmnd *ptr; Scsi_Cmnd *ptr;
unsigned long flags; unsigned long flags;
NCR_PRINT(NDEBUG_ANY); NCR5380_dprint(NDEBUG_ANY, instance);
NCR_PRINT_PHASE(NDEBUG_ANY); NCR5380_dprint_phase(NDEBUG_ANY, instance);
hostdata = (struct NCR5380_hostdata *)instance->hostdata; hostdata = (struct NCR5380_hostdata *)instance->hostdata;
...@@ -1196,7 +1196,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id) ...@@ -1196,7 +1196,7 @@ static irqreturn_t NCR5380_intr (int irq, void *dev_id)
INT_PRINTK("scsi%d: BASR=%02x\n", HOSTNO, basr); INT_PRINTK("scsi%d: BASR=%02x\n", HOSTNO, basr);
/* dispatch to appropriate routine if found and done=0 */ /* dispatch to appropriate routine if found and done=0 */
if (basr & BASR_IRQ) { if (basr & BASR_IRQ) {
NCR_PRINT(NDEBUG_INTR); NCR5380_dprint(NDEBUG_INTR, instance);
if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) { if ((NCR5380_read(STATUS_REG) & (SR_SEL|SR_IO)) == (SR_SEL|SR_IO)) {
done = 0; done = 0;
// ENABLE_IRQ(); // ENABLE_IRQ();
...@@ -1338,7 +1338,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd, ...@@ -1338,7 +1338,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
unsigned long flags; unsigned long flags;
hostdata->restart_select = 0; hostdata->restart_select = 0;
NCR_PRINT(NDEBUG_ARBITRATION); NCR5380_dprint(NDEBUG_ARBITRATION, instance);
ARB_PRINTK("scsi%d: starting arbitration, id = %d\n", HOSTNO, ARB_PRINTK("scsi%d: starting arbitration, id = %d\n", HOSTNO,
instance->this_id); instance->this_id);
...@@ -1559,7 +1559,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd, ...@@ -1559,7 +1559,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
printk(KERN_ERR "scsi%d: weirdness\n", HOSTNO); printk(KERN_ERR "scsi%d: weirdness\n", HOSTNO);
if (hostdata->restart_select) if (hostdata->restart_select)
printk(KERN_NOTICE "\trestart select\n"); printk(KERN_NOTICE "\trestart select\n");
NCR_PRINT(NDEBUG_ANY); NCR5380_dprint(NDEBUG_ANY, instance);
NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask); NCR5380_write(SELECT_ENABLE_REG, hostdata->id_mask);
return -1; return -1;
} }
...@@ -1685,7 +1685,7 @@ static int NCR5380_transfer_pio( struct Scsi_Host *instance, ...@@ -1685,7 +1685,7 @@ static int NCR5380_transfer_pio( struct Scsi_Host *instance,
/* Check for phase mismatch */ /* Check for phase mismatch */
if ((tmp & PHASE_MASK) != p) { if ((tmp & PHASE_MASK) != p) {
PIO_PRINTK("scsi%d: phase mismatch\n", HOSTNO); PIO_PRINTK("scsi%d: phase mismatch\n", HOSTNO);
NCR_PRINT_PHASE(NDEBUG_PIO); NCR5380_dprint_phase(NDEBUG_PIO, instance);
break; break;
} }
...@@ -1708,18 +1708,18 @@ static int NCR5380_transfer_pio( struct Scsi_Host *instance, ...@@ -1708,18 +1708,18 @@ static int NCR5380_transfer_pio( struct Scsi_Host *instance,
if (!((p & SR_MSG) && c > 1)) { if (!((p & SR_MSG) && c > 1)) {
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
ICR_ASSERT_DATA); ICR_ASSERT_DATA);
NCR_PRINT(NDEBUG_PIO); NCR5380_dprint(NDEBUG_PIO, instance);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
ICR_ASSERT_DATA | ICR_ASSERT_ACK); ICR_ASSERT_DATA | ICR_ASSERT_ACK);
} else { } else {
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
ICR_ASSERT_DATA | ICR_ASSERT_ATN); ICR_ASSERT_DATA | ICR_ASSERT_ATN);
NCR_PRINT(NDEBUG_PIO); NCR5380_dprint(NDEBUG_PIO, instance);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE |
ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_ACK); ICR_ASSERT_DATA | ICR_ASSERT_ATN | ICR_ASSERT_ACK);
} }
} else { } else {
NCR_PRINT(NDEBUG_PIO); NCR5380_dprint(NDEBUG_PIO, instance);
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ACK); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ACK);
} }
...@@ -1931,7 +1931,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance) ...@@ -1931,7 +1931,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
phase = (tmp & PHASE_MASK); phase = (tmp & PHASE_MASK);
if (phase != old_phase) { if (phase != old_phase) {
old_phase = phase; old_phase = phase;
NCR_PRINT_PHASE(NDEBUG_INFORMATION); NCR5380_dprint_phase(NDEBUG_INFORMATION, instance);
} }
if(phase == PHASE_CMDOUT) { if(phase == PHASE_CMDOUT) {
...@@ -2416,7 +2416,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance) ...@@ -2416,7 +2416,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
break; break;
default: default:
printk("scsi%d: unknown phase\n", HOSTNO); printk("scsi%d: unknown phase\n", HOSTNO);
NCR_PRINT(NDEBUG_ANY); NCR5380_dprint(NDEBUG_ANY, instance);
} /* switch(phase) */ } /* switch(phase) */
} /* if (tmp * SR_REQ) */ } /* if (tmp * SR_REQ) */
} /* while (1) */ } /* while (1) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7