Re: [PATCH 06/12] scsi/NCR5380: fix dprintk macro usage and definition
On Tue, Mar 18, 2014 at 11:42:18AM +1100, Finn Thain wrote: > There are three implementations of the core NCR5380 driver and three sets > of debugging macro definitions. And all three implementations use the > NCR5380.h header as well. > > Two of the definitions of the dprintk macro accept a variable argument list > whereas the third does not. Standardize on the variable argument list. > > Signed-off-by: Finn Thain Looks good, Reviewed-by: Christoph Hellwig -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 06/12] scsi/NCR5380: fix dprintk macro usage and definition
On Tue, Mar 18, 2014 at 11:42:18AM +1100, Finn Thain wrote: There are three implementations of the core NCR5380 driver and three sets of debugging macro definitions. And all three implementations use the NCR5380.h header as well. Two of the definitions of the dprintk macro accept a variable argument list whereas the third does not. Standardize on the variable argument list. Signed-off-by: Finn Thain fth...@telegraphics.com.au Looks good, Reviewed-by: Christoph Hellwig h...@lst.de -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 06/12] scsi/NCR5380: fix dprintk macro usage and definition
There are three implementations of the core NCR5380 driver and three sets
of debugging macro definitions. And all three implementations use the
NCR5380.h header as well.
Two of the definitions of the dprintk macro accept a variable argument list
whereas the third does not. Standardize on the variable argument list.
Signed-off-by: Finn Thain
---
drivers/scsi/NCR5380.c | 126 -
drivers/scsi/NCR5380.h |6 +-
2 files changed, 66 insertions(+), 66 deletions(-)
Index: linux-m68k/drivers/scsi/NCR5380.c
===
--- linux-m68k.orig/drivers/scsi/NCR5380.c 2014-03-18 00:18:34.0
+1100
+++ linux-m68k/drivers/scsi/NCR5380.c 2014-03-18 00:18:34.0 +1100
@@ -1003,7 +1003,7 @@ static int NCR5380_queue_command_lck(Scs
LIST(cmd, tmp);
tmp->host_scribble = (unsigned char *) cmd;
}
- dprintk(NDEBUG_QUEUES, ("scsi%d : command added to %s of queue\n",
instance->host_no, (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail"));
+ dprintk(NDEBUG_QUEUES, "scsi%d : command added to %s of queue\n",
instance->host_no, (cmd->cmnd[0] == REQUEST_SENSE) ? "head" : "tail");
/* Run the coroutine if it isn't already running. */
/* Kick off command processing */
@@ -1038,7 +1038,7 @@ static void NCR5380_main(struct work_str
/* Lock held here */
done = 1;
if (!hostdata->connected && !hostdata->selecting) {
- dprintk(NDEBUG_MAIN, ("scsi%d : not connected\n",
instance->host_no));
+ dprintk(NDEBUG_MAIN, "scsi%d : not connected\n",
instance->host_no);
/*
* Search through the issue_queue for a command destined
* for a target that's not busy.
@@ -1046,7 +1046,7 @@ static void NCR5380_main(struct work_str
for (tmp = (Scsi_Cmnd *) hostdata->issue_queue, prev =
NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp->host_scribble)
{
if (prev != tmp)
- dprintk(NDEBUG_LISTS, ("MAIN tmp=%p
target=%d busy=%d lun=%d\n", tmp, tmp->device->id,
hostdata->busy[tmp->device->id], tmp->device->lun));
+ dprintk(NDEBUG_LISTS, "MAIN tmp=%p
target=%d busy=%d lun=%d\n", tmp, tmp->device->id,
hostdata->busy[tmp->device->id], tmp->device->lun);
/* When we find one, remove it from the issue
queue. */
if (!(hostdata->busy[tmp->device->id] & (1 <<
tmp->device->lun))) {
if (prev) {
@@ -1064,7 +1064,7 @@ static void NCR5380_main(struct work_str
* On failure, we must add the command
back to the
* issue queue so we can keep trying.
*/
- dprintk(NDEBUG_MAIN|NDEBUG_QUEUES,
("scsi%d : main() : command for target %d lun %d removed from issue_queue\n",
instance->host_no, tmp->device->id, tmp->device->lun));
+ dprintk(NDEBUG_MAIN|NDEBUG_QUEUES,
"scsi%d : main() : command for target %d lun %d removed from issue_queue\n",
instance->host_no, tmp->device->id, tmp->device->lun);
/*
* A successful selection is defined as
one that
@@ -1093,7 +1093,7 @@ static void NCR5380_main(struct work_str
tmp->host_scribble = (unsigned
char *) hostdata->issue_queue;
hostdata->issue_queue = tmp;
done = 0;
-
dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, ("scsi%d : main(): select() failed, returned
to issue_queue\n", instance->host_no));
+
dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, "scsi%d : main(): select() failed, returned
to issue_queue\n", instance->host_no);
}
/* lock held here still */
} /* if target/lun is not busy */
@@ -1123,9 +1123,9 @@ static void NCR5380_main(struct work_str
#endif
&& (!hostdata->time_expires ||
time_before_eq(hostdata->time_expires, jiffies))
) {
- dprintk(NDEBUG_MAIN, ("scsi%d : main() : performing
information transfer\n", instance->host_no));
+ dprintk(NDEBUG_MAIN, "scsi%d : main() : performing
information transfer\n", instance->host_no);
NCR5380_information_transfer(instance);
-
[PATCH 06/12] scsi/NCR5380: fix dprintk macro usage and definition
There are three implementations of the core NCR5380 driver and three sets
of debugging macro definitions. And all three implementations use the
NCR5380.h header as well.
Two of the definitions of the dprintk macro accept a variable argument list
whereas the third does not. Standardize on the variable argument list.
Signed-off-by: Finn Thain fth...@telegraphics.com.au
---
drivers/scsi/NCR5380.c | 126 -
drivers/scsi/NCR5380.h |6 +-
2 files changed, 66 insertions(+), 66 deletions(-)
Index: linux-m68k/drivers/scsi/NCR5380.c
===
--- linux-m68k.orig/drivers/scsi/NCR5380.c 2014-03-18 00:18:34.0
+1100
+++ linux-m68k/drivers/scsi/NCR5380.c 2014-03-18 00:18:34.0 +1100
@@ -1003,7 +1003,7 @@ static int NCR5380_queue_command_lck(Scs
LIST(cmd, tmp);
tmp-host_scribble = (unsigned char *) cmd;
}
- dprintk(NDEBUG_QUEUES, (scsi%d : command added to %s of queue\n,
instance-host_no, (cmd-cmnd[0] == REQUEST_SENSE) ? head : tail));
+ dprintk(NDEBUG_QUEUES, scsi%d : command added to %s of queue\n,
instance-host_no, (cmd-cmnd[0] == REQUEST_SENSE) ? head : tail);
/* Run the coroutine if it isn't already running. */
/* Kick off command processing */
@@ -1038,7 +1038,7 @@ static void NCR5380_main(struct work_str
/* Lock held here */
done = 1;
if (!hostdata-connected !hostdata-selecting) {
- dprintk(NDEBUG_MAIN, (scsi%d : not connected\n,
instance-host_no));
+ dprintk(NDEBUG_MAIN, scsi%d : not connected\n,
instance-host_no);
/*
* Search through the issue_queue for a command destined
* for a target that's not busy.
@@ -1046,7 +1046,7 @@ static void NCR5380_main(struct work_str
for (tmp = (Scsi_Cmnd *) hostdata-issue_queue, prev =
NULL; tmp; prev = tmp, tmp = (Scsi_Cmnd *) tmp-host_scribble)
{
if (prev != tmp)
- dprintk(NDEBUG_LISTS, (MAIN tmp=%p
target=%d busy=%d lun=%d\n, tmp, tmp-device-id,
hostdata-busy[tmp-device-id], tmp-device-lun));
+ dprintk(NDEBUG_LISTS, MAIN tmp=%p
target=%d busy=%d lun=%d\n, tmp, tmp-device-id,
hostdata-busy[tmp-device-id], tmp-device-lun);
/* When we find one, remove it from the issue
queue. */
if (!(hostdata-busy[tmp-device-id] (1
tmp-device-lun))) {
if (prev) {
@@ -1064,7 +1064,7 @@ static void NCR5380_main(struct work_str
* On failure, we must add the command
back to the
* issue queue so we can keep trying.
*/
- dprintk(NDEBUG_MAIN|NDEBUG_QUEUES,
(scsi%d : main() : command for target %d lun %d removed from issue_queue\n,
instance-host_no, tmp-device-id, tmp-device-lun));
+ dprintk(NDEBUG_MAIN|NDEBUG_QUEUES,
scsi%d : main() : command for target %d lun %d removed from issue_queue\n,
instance-host_no, tmp-device-id, tmp-device-lun);
/*
* A successful selection is defined as
one that
@@ -1093,7 +1093,7 @@ static void NCR5380_main(struct work_str
tmp-host_scribble = (unsigned
char *) hostdata-issue_queue;
hostdata-issue_queue = tmp;
done = 0;
-
dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, (scsi%d : main(): select() failed, returned
to issue_queue\n, instance-host_no));
+
dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, scsi%d : main(): select() failed, returned
to issue_queue\n, instance-host_no);
}
/* lock held here still */
} /* if target/lun is not busy */
@@ -1123,9 +1123,9 @@ static void NCR5380_main(struct work_str
#endif
(!hostdata-time_expires ||
time_before_eq(hostdata-time_expires, jiffies))
) {
- dprintk(NDEBUG_MAIN, (scsi%d : main() : performing
information transfer\n, instance-host_no));
+ dprintk(NDEBUG_MAIN, scsi%d : main() : performing
information transfer\n, instance-host_no);
NCR5380_information_transfer(instance);
- dprintk(NDEBUG_MAIN, (scsi%d : main() : done set
false\n,
