AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[S390] tape: Use pr_xxx instead of dev_xxx in shared driver code

Browse Source 
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>
This commit is contained in:
Michael Holzheu 2009-09-11 10:29:07 +02:00 committed by Martin Schwidefsky
parent bde69af2ab
commit 59e36927ee
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/s390/char/tape_34xx.c
View File

@ -8,7 +8,7 @@
* Martin Schwidefsky <schwidefsky@de.ibm.com> * Martin Schwidefsky <schwidefsky@de.ibm.com>
*/ */
#define KMSG_COMPONENT "tape" #define KMSG_COMPONENT "tape_34xx"
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>

4
drivers/s390/char/tape_3590.c
View File

@ -8,7 +8,7 @@
* Martin Schwidefsky <schwidefsky@de.ibm.com> * Martin Schwidefsky <schwidefsky@de.ibm.com>
*/ */
#define KMSG_COMPONENT "tape" #define KMSG_COMPONENT "tape_3590"
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@ -39,8 +39,6 @@ EXPORT_SYMBOL(TAPE_DBF_AREA);
* - Read Alternate: implemented * - Read Alternate: implemented
*******************************************************************/ *******************************************************************/
#define KMSG_COMPONENT "tape"
static const char *tape_3590_msg[TAPE_3590_MAX_MSG] = { static const char *tape_3590_msg[TAPE_3590_MAX_MSG] = {
[0x00] = "", [0x00] = "",
[0x10] = "Lost Sense", [0x10] = "Lost Sense",

12
drivers/s390/char/tape_block.c
View File

@ -310,8 +310,8 @@ tapeblock_revalidate_disk(struct gendisk *disk)
if (rc < 0) if (rc < 0)
return rc; return rc;
dev_info(&device->cdev->dev, "Determining the size of the recorded " pr_info("%s: Determining the size of the recorded area...\n",
"area...\n"); dev_name(&device->cdev->dev));
DBF_LH(3, "Image file ends at %d\n", rc); DBF_LH(3, "Image file ends at %d\n", rc);
nr_of_blks = rc; nr_of_blks = rc;
@ -330,8 +330,8 @@ tapeblock_revalidate_disk(struct gendisk *disk)
device->bof = rc; device->bof = rc;
nr_of_blks -= rc; nr_of_blks -= rc;
dev_info(&device->cdev->dev, "The size of the recorded area is %i " pr_info("%s: The size of the recorded area is %i blocks\n",
"blocks\n", nr_of_blks); dev_name(&device->cdev->dev), nr_of_blks);
set_capacity(device->blk_data.disk, set_capacity(device->blk_data.disk,
nr_of_blks*(TAPEBLOCK_HSEC_SIZE/512)); nr_of_blks*(TAPEBLOCK_HSEC_SIZE/512));
@ -366,8 +366,8 @@ tapeblock_open(struct block_device *bdev, fmode_t mode)
if (device->required_tapemarks) { if (device->required_tapemarks) {
DBF_EVENT(2, "TBLOCK: missing tapemarks\n"); DBF_EVENT(2, "TBLOCK: missing tapemarks\n");
dev_warn(&device->cdev->dev, "Opening the tape failed because" pr_warning("%s: Opening the tape failed because of missing "
" of missing end-of-file marks\n"); "end-of-file marks\n", dev_name(&device->cdev->dev));
rc = -EPERM; rc = -EPERM;
goto put_device; goto put_device;
} }

12
drivers/s390/char/tape_core.c
View File

@ -215,14 +215,14 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate)
case MS_UNLOADED: case MS_UNLOADED:
device->tape_generic_status |= GMT_DR_OPEN(~0); device->tape_generic_status |= GMT_DR_OPEN(~0);
if (device->medium_state == MS_LOADED) if (device->medium_state == MS_LOADED)
dev_info(&device->cdev->dev, "The tape cartridge has " pr_info("%s: The tape cartridge has been successfully "
"been successfully unloaded\n"); "unloaded\n", dev_name(&device->cdev->dev));
break; break;
case MS_LOADED: case MS_LOADED:
device->tape_generic_status &= ~GMT_DR_OPEN(~0); device->tape_generic_status &= ~GMT_DR_OPEN(~0);
if (device->medium_state == MS_UNLOADED) if (device->medium_state == MS_UNLOADED)
dev_info(&device->cdev->dev, "A tape cartridge has " pr_info("%s: A tape cartridge has been mounted\n",
"been mounted\n"); dev_name(&device->cdev->dev));
break; break;
default: default:
// print nothing // print nothing
@ -656,8 +656,8 @@ tape_generic_remove(struct ccw_device *cdev)
*/ */
DBF_EVENT(3, "(%08x): Drive in use vanished!\n", DBF_EVENT(3, "(%08x): Drive in use vanished!\n",
device->cdev_id); device->cdev_id);
dev_warn(&device->cdev->dev, "A tape unit was detached" pr_warning("%s: A tape unit was detached while in "
" while in use\n"); "use\n", dev_name(&device->cdev->dev));
tape_state_set(device, TS_NOT_OPER); tape_state_set(device, TS_NOT_OPER);
__tape_discard_requests(device); __tape_discard_requests(device);
spin_unlock_irq(get_ccwdev_lock(device->cdev)); spin_unlock_irq(get_ccwdev_lock(device->cdev));