diff options
author | Michael Holzheu <holzheu@linux.vnet.ibm.com> | 2009-09-11 04:29:07 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-09-11 04:29:57 -0400 |
commit | 59e36927ee08f3bf06d8d14597e57389bf1b41dc (patch) | |
tree | f9120693b80ce05380d7197c2eda7faec16059f6 /drivers/s390/char/tape_block.c | |
parent | bde69af2ab696eebfac9583ea1e8a46b571e317f (diff) |
[S390] tape: Use pr_xxx instead of dev_xxx in shared driver code
For messages from the tape core that is shared between the 3590 and 34xx
tape disciplines, we want to have the "tape" prefix instead of "tape_3590"
or "tape_34xx". In order to fix this, we now use the pr_xxx printk macros.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/tape_block.c')
-rw-r--r-- | drivers/s390/char/tape_block.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index 1c2a582e626c..4cb9e70507ab 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c | |||
@@ -310,8 +310,8 @@ tapeblock_revalidate_disk(struct gendisk *disk) | |||
310 | if (rc < 0) | 310 | if (rc < 0) |
311 | return rc; | 311 | return rc; |
312 | 312 | ||
313 | dev_info(&device->cdev->dev, "Determining the size of the recorded " | 313 | pr_info("%s: Determining the size of the recorded area...\n", |
314 | "area...\n"); | 314 | dev_name(&device->cdev->dev)); |
315 | DBF_LH(3, "Image file ends at %d\n", rc); | 315 | DBF_LH(3, "Image file ends at %d\n", rc); |
316 | nr_of_blks = rc; | 316 | nr_of_blks = rc; |
317 | 317 | ||
@@ -330,8 +330,8 @@ tapeblock_revalidate_disk(struct gendisk *disk) | |||
330 | device->bof = rc; | 330 | device->bof = rc; |
331 | nr_of_blks -= rc; | 331 | nr_of_blks -= rc; |
332 | 332 | ||
333 | dev_info(&device->cdev->dev, "The size of the recorded area is %i " | 333 | pr_info("%s: The size of the recorded area is %i blocks\n", |
334 | "blocks\n", nr_of_blks); | 334 | dev_name(&device->cdev->dev), nr_of_blks); |
335 | set_capacity(device->blk_data.disk, | 335 | set_capacity(device->blk_data.disk, |
336 | nr_of_blks*(TAPEBLOCK_HSEC_SIZE/512)); | 336 | nr_of_blks*(TAPEBLOCK_HSEC_SIZE/512)); |
337 | 337 | ||
@@ -366,8 +366,8 @@ tapeblock_open(struct block_device *bdev, fmode_t mode) | |||
366 | 366 | ||
367 | if (device->required_tapemarks) { | 367 | if (device->required_tapemarks) { |
368 | DBF_EVENT(2, "TBLOCK: missing tapemarks\n"); | 368 | DBF_EVENT(2, "TBLOCK: missing tapemarks\n"); |
369 | dev_warn(&device->cdev->dev, "Opening the tape failed because" | 369 | pr_warning("%s: Opening the tape failed because of missing " |
370 | " of missing end-of-file marks\n"); | 370 | "end-of-file marks\n", dev_name(&device->cdev->dev)); |
371 | rc = -EPERM; | 371 | rc = -EPERM; |
372 | goto put_device; | 372 | goto put_device; |
373 | } | 373 | } |