GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[S390] dasd: fix message naming

Browse source 
This patch fixes message naming so that generic dasd messages do not
contain the device discipline. For this purpose the dev_ makros are
replaced by pr_ makros for generic dasd messages.

Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Stefan Haberland 2009-09-11 10:28:30 +02:00 • committed by Martin Schwidefsky
parent 68b781fe1b
commit ca99dab01d
8 changed files with 20 additions and 20 deletions

2
drivers/s390/block/dasd_3990_erp.c
View file

@ -7,7 +7,7 @@
* *
*/ */
#define KMSG_COMPONENT "dasd" #define KMSG_COMPONENT "dasd-eckd"
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/slab.h> #include <linux/slab.h>

2
drivers/s390/block/dasd_alias.c
View file

@ -5,7 +5,7 @@
* Author(s): Stefan Weinhuber <wein@de.ibm.com> * Author(s): Stefan Weinhuber <wein@de.ibm.com>
*/ */
#define KMSG_COMPONENT "dasd" #define KMSG_COMPONENT "dasd-eckd"
#include <linux/list.h> #include <linux/list.h>
#include <asm/ebcdic.h> #include <asm/ebcdic.h>

2
drivers/s390/block/dasd_diag.c
View file

@ -8,7 +8,7 @@
* *
*/ */
#define KMSG_COMPONENT "dasd" #define KMSG_COMPONENT "dasd-diag"
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
drivers/s390/block/dasd_eckd.c
View file

@ -10,7 +10,7 @@
* Author.........: Nigel Hislop <hislop_nigel@emc.com> * Author.........: Nigel Hislop <hislop_nigel@emc.com>
*/ */
#define KMSG_COMPONENT "dasd" #define KMSG_COMPONENT "dasd-eckd"
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/kernel.h> #include <linux/kernel.h>

2
drivers/s390/block/dasd_eer.c
View file

@ -6,7 +6,7 @@
* Author(s): Stefan Weinhuber <wein@de.ibm.com> * Author(s): Stefan Weinhuber <wein@de.ibm.com>
*/ */
#define KMSG_COMPONENT "dasd" #define KMSG_COMPONENT "dasd-eckd"
#include <linux/init.h> #include <linux/init.h>
#include <linux/fs.h> #include <linux/fs.h>

4
drivers/s390/block/dasd_erp.c
View file

@ -99,8 +99,8 @@ dasd_default_erp_action(struct dasd_ccw_req *cqr)
cqr->lpm = LPM_ANYPATH; cqr->lpm = LPM_ANYPATH;
cqr->status = DASD_CQR_FILLED; cqr->status = DASD_CQR_FILLED;
} else { } else {
dev_err(&device->cdev->dev, pr_err("%s: default ERP has run out of retries and failed\n",
"default ERP has run out of retries and failed\n"); dev_name(&device->cdev->dev));
cqr->status = DASD_CQR_FAILED; cqr->status = DASD_CQR_FAILED;
cqr->stopclk = get_clock(); cqr->stopclk = get_clock();
} }

2
drivers/s390/block/dasd_fba.c
View file

@ -5,7 +5,7 @@
* Copyright IBM Corp. 1999, 2009 * Copyright IBM Corp. 1999, 2009
*/ */
#define KMSG_COMPONENT "dasd" #define KMSG_COMPONENT "dasd-fba"
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/kernel.h> #include <linux/kernel.h>

24
drivers/s390/block/dasd_ioctl.c
View file

@ -98,8 +98,8 @@ static int dasd_ioctl_quiesce(struct dasd_block *block)
if (!capable (CAP_SYS_ADMIN)) if (!capable (CAP_SYS_ADMIN))
return -EACCES; return -EACCES;
dev_info(&base->cdev->dev, "The DASD has been put in the quiesce " pr_info("%s: The DASD has been put in the quiesce "
"state\n"); "state\n", dev_name(&base->cdev->dev));
spin_lock_irqsave(get_ccwdev_lock(base->cdev), flags); spin_lock_irqsave(get_ccwdev_lock(base->cdev), flags);
base->stopped |= DASD_STOPPED_QUIESCE; base->stopped |= DASD_STOPPED_QUIESCE;
spin_unlock_irqrestore(get_ccwdev_lock(base->cdev), flags); spin_unlock_irqrestore(get_ccwdev_lock(base->cdev), flags);
@ -119,8 +119,8 @@ static int dasd_ioctl_resume(struct dasd_block *block)
if (!capable (CAP_SYS_ADMIN)) if (!capable (CAP_SYS_ADMIN))
return -EACCES; return -EACCES;
dev_info(&base->cdev->dev, "I/O operations have been resumed " pr_info("%s: I/O operations have been resumed "
"on the DASD\n"); "on the DASD\n", dev_name(&base->cdev->dev));
spin_lock_irqsave(get_ccwdev_lock(base->cdev), flags); spin_lock_irqsave(get_ccwdev_lock(base->cdev), flags);
base->stopped &= ~DASD_STOPPED_QUIESCE; base->stopped &= ~DASD_STOPPED_QUIESCE;
spin_unlock_irqrestore(get_ccwdev_lock(base->cdev), flags); spin_unlock_irqrestore(get_ccwdev_lock(base->cdev), flags);
@ -146,8 +146,8 @@ static int dasd_format(struct dasd_block *block, struct format_data_t *fdata)
return -EPERM; return -EPERM;
if (base->state != DASD_STATE_BASIC) { if (base->state != DASD_STATE_BASIC) {
dev_warn(&base->cdev->dev, pr_warning("%s: The DASD cannot be formatted while it is "
"The DASD cannot be formatted while it is enabled\n"); "enabled\n", dev_name(&base->cdev->dev));
return -EBUSY; return -EBUSY;
} }
@ -175,9 +175,9 @@ static int dasd_format(struct dasd_block *block, struct format_data_t *fdata)
dasd_sfree_request(cqr, cqr->memdev); dasd_sfree_request(cqr, cqr->memdev);
if (rc) { if (rc) {
if (rc != -ERESTARTSYS) if (rc != -ERESTARTSYS)
dev_err(&base->cdev->dev, pr_err("%s: Formatting unit %d failed with "
"Formatting unit %d failed with " "rc=%d\n", dev_name(&base->cdev->dev),
"rc=%d\n", fdata->start_unit, rc); fdata->start_unit, rc);
return rc; return rc;
} }
fdata->start_unit++; fdata->start_unit++;
@ -204,9 +204,9 @@ dasd_ioctl_format(struct block_device *bdev, void __user *argp)
if (copy_from_user(&fdata, argp, sizeof(struct format_data_t))) if (copy_from_user(&fdata, argp, sizeof(struct format_data_t)))
return -EFAULT; return -EFAULT;
if (bdev != bdev->bd_contains) { if (bdev != bdev->bd_contains) {
dev_warn(&block->base->cdev->dev, pr_warning("%s: The specified DASD is a partition and cannot "
"The specified DASD is a partition and cannot be " "be formatted\n",
"formatted\n"); dev_name(&block->base->cdev->dev));
return -EINVAL; return -EINVAL;
} }
return dasd_format(block, &fdata); return dasd_format(block, &fdata);