diff options
author | Christoph Hellwig <hch@lst.de> | 2015-01-18 10:11:28 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2015-01-20 13:43:22 -0500 |
commit | 2fc583c4628bf782e62d0c66d57c5de040fac451 (patch) | |
tree | e6ecddc8621c39c3b8ebc53331b875e447f97d81 | |
parent | 6a806cbc1525e6f95e22173d9f54a7b75a2bb973 (diff) |
scsi: always use format argumets for dev_printk
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: James Bottomley <JBottomley@Parallels.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
-rw-r--r-- | drivers/scsi/scsi_logging.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/scsi_logging.c b/drivers/scsi/scsi_logging.c index 6128303f9c50..ecc5918e372a 100644 --- a/drivers/scsi/scsi_logging.c +++ b/drivers/scsi/scsi_logging.c | |||
@@ -251,7 +251,7 @@ void scsi_print_command(struct scsi_cmnd *cmd) | |||
251 | if (cmd->cmd_len > 16) { | 251 | if (cmd->cmd_len > 16) { |
252 | /* Print opcode in one line and use separate lines for CDB */ | 252 | /* Print opcode in one line and use separate lines for CDB */ |
253 | off += scnprintf(logbuf + off, logbuf_len - off, "\n"); | 253 | off += scnprintf(logbuf + off, logbuf_len - off, "\n"); |
254 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, logbuf); | 254 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, "%s", logbuf); |
255 | scsi_log_release_buffer(logbuf); | 255 | scsi_log_release_buffer(logbuf); |
256 | for (k = 0; k < cmd->cmd_len; k += 16) { | 256 | for (k = 0; k < cmd->cmd_len; k += 16) { |
257 | size_t linelen = min(cmd->cmd_len - k, 16); | 257 | size_t linelen = min(cmd->cmd_len - k, 16); |
@@ -269,7 +269,7 @@ void scsi_print_command(struct scsi_cmnd *cmd) | |||
269 | 16, 1, logbuf + off, | 269 | 16, 1, logbuf + off, |
270 | logbuf_len - off, false); | 270 | logbuf_len - off, false); |
271 | } | 271 | } |
272 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, | 272 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, "%s", |
273 | logbuf); | 273 | logbuf); |
274 | scsi_log_release_buffer(logbuf); | 274 | scsi_log_release_buffer(logbuf); |
275 | } | 275 | } |
@@ -282,7 +282,7 @@ void scsi_print_command(struct scsi_cmnd *cmd) | |||
282 | false); | 282 | false); |
283 | } | 283 | } |
284 | out_printk: | 284 | out_printk: |
285 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, logbuf); | 285 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, "%s", logbuf); |
286 | scsi_log_release_buffer(logbuf); | 286 | scsi_log_release_buffer(logbuf); |
287 | } | 287 | } |
288 | EXPORT_SYMBOL(scsi_print_command); | 288 | EXPORT_SYMBOL(scsi_print_command); |
@@ -360,7 +360,7 @@ scsi_log_dump_sense(const struct scsi_device *sdev, const char *name, int tag, | |||
360 | hex_dump_to_buffer(&sense_buffer[i], len, 16, 1, | 360 | hex_dump_to_buffer(&sense_buffer[i], len, 16, 1, |
361 | logbuf + off, logbuf_len - off, | 361 | logbuf + off, logbuf_len - off, |
362 | false); | 362 | false); |
363 | dev_printk(KERN_INFO, &sdev->sdev_gendev, logbuf); | 363 | dev_printk(KERN_INFO, &sdev->sdev_gendev, "%s", logbuf); |
364 | } | 364 | } |
365 | scsi_log_release_buffer(logbuf); | 365 | scsi_log_release_buffer(logbuf); |
366 | } | 366 | } |
@@ -377,7 +377,7 @@ scsi_log_print_sense_hdr(const struct scsi_device *sdev, const char *name, | |||
377 | return; | 377 | return; |
378 | off = sdev_format_header(logbuf, logbuf_len, name, tag); | 378 | off = sdev_format_header(logbuf, logbuf_len, name, tag); |
379 | off += scsi_format_sense_hdr(logbuf + off, logbuf_len - off, sshdr); | 379 | off += scsi_format_sense_hdr(logbuf + off, logbuf_len - off, sshdr); |
380 | dev_printk(KERN_INFO, &sdev->sdev_gendev, logbuf); | 380 | dev_printk(KERN_INFO, &sdev->sdev_gendev, "%s", logbuf); |
381 | scsi_log_release_buffer(logbuf); | 381 | scsi_log_release_buffer(logbuf); |
382 | 382 | ||
383 | logbuf = scsi_log_reserve_buffer(&logbuf_len); | 383 | logbuf = scsi_log_reserve_buffer(&logbuf_len); |
@@ -386,7 +386,7 @@ scsi_log_print_sense_hdr(const struct scsi_device *sdev, const char *name, | |||
386 | off = sdev_format_header(logbuf, logbuf_len, name, tag); | 386 | off = sdev_format_header(logbuf, logbuf_len, name, tag); |
387 | off += scsi_format_extd_sense(logbuf + off, logbuf_len - off, | 387 | off += scsi_format_extd_sense(logbuf + off, logbuf_len - off, |
388 | sshdr->asc, sshdr->ascq); | 388 | sshdr->asc, sshdr->ascq); |
389 | dev_printk(KERN_INFO, &sdev->sdev_gendev, logbuf); | 389 | dev_printk(KERN_INFO, &sdev->sdev_gendev, "%s", logbuf); |
390 | scsi_log_release_buffer(logbuf); | 390 | scsi_log_release_buffer(logbuf); |
391 | } | 391 | } |
392 | 392 | ||
@@ -483,7 +483,7 @@ void scsi_print_result(const struct scsi_cmnd *cmd, const char *msg, | |||
483 | off += scnprintf(logbuf + off, logbuf_len - off, | 483 | off += scnprintf(logbuf + off, logbuf_len - off, |
484 | "driverbyte=0x%02x", driver_byte(cmd->result)); | 484 | "driverbyte=0x%02x", driver_byte(cmd->result)); |
485 | out_printk: | 485 | out_printk: |
486 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, logbuf); | 486 | dev_printk(KERN_INFO, &cmd->device->sdev_gendev, "%s", logbuf); |
487 | scsi_log_release_buffer(logbuf); | 487 | scsi_log_release_buffer(logbuf); |
488 | } | 488 | } |
489 | EXPORT_SYMBOL(scsi_print_result); | 489 | EXPORT_SYMBOL(scsi_print_result); |