diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:48 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2008-12-25 07:39:24 -0500 |
commit | b3ff088b3025c3583194edd7576215b61333111f (patch) | |
tree | 125e2a3dbf22ac597ff4cb10573c0cb6d7aed41c /drivers/s390/char/sclp_cmd.c | |
parent | 8f7c502c267c0e5e2dbbbdea9f3e7e85bbc95694 (diff) |
[S390] convert sclp printks to pr_xxx macros.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/sclp_cmd.c')
-rw-r--r-- | drivers/s390/char/sclp_cmd.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/drivers/s390/char/sclp_cmd.c b/drivers/s390/char/sclp_cmd.c index ec9c0bcf66ee..506390496416 100644 --- a/drivers/s390/char/sclp_cmd.c +++ b/drivers/s390/char/sclp_cmd.c | |||
@@ -6,6 +6,9 @@ | |||
6 | * Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 6 | * Peter Oberparleiter <peter.oberparleiter@de.ibm.com> |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #define KMSG_COMPONENT "sclp_cmd" | ||
10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | ||
11 | |||
9 | #include <linux/completion.h> | 12 | #include <linux/completion.h> |
10 | #include <linux/init.h> | 13 | #include <linux/init.h> |
11 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
@@ -16,9 +19,8 @@ | |||
16 | #include <linux/memory.h> | 19 | #include <linux/memory.h> |
17 | #include <asm/chpid.h> | 20 | #include <asm/chpid.h> |
18 | #include <asm/sclp.h> | 21 | #include <asm/sclp.h> |
19 | #include "sclp.h" | ||
20 | 22 | ||
21 | #define TAG "sclp_cmd: " | 23 | #include "sclp.h" |
22 | 24 | ||
23 | #define SCLP_CMDW_READ_SCP_INFO 0x00020001 | 25 | #define SCLP_CMDW_READ_SCP_INFO 0x00020001 |
24 | #define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001 | 26 | #define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001 |
@@ -169,8 +171,8 @@ static int do_sync_request(sclp_cmdw_t cmd, void *sccb) | |||
169 | 171 | ||
170 | /* Check response. */ | 172 | /* Check response. */ |
171 | if (request->status != SCLP_REQ_DONE) { | 173 | if (request->status != SCLP_REQ_DONE) { |
172 | printk(KERN_WARNING TAG "sync request failed " | 174 | pr_warning("sync request failed (cmd=0x%08x, " |
173 | "(cmd=0x%08x, status=0x%02x)\n", cmd, request->status); | 175 | "status=0x%02x)\n", cmd, request->status); |
174 | rc = -EIO; | 176 | rc = -EIO; |
175 | } | 177 | } |
176 | out: | 178 | out: |
@@ -224,8 +226,8 @@ int sclp_get_cpu_info(struct sclp_cpu_info *info) | |||
224 | if (rc) | 226 | if (rc) |
225 | goto out; | 227 | goto out; |
226 | if (sccb->header.response_code != 0x0010) { | 228 | if (sccb->header.response_code != 0x0010) { |
227 | printk(KERN_WARNING TAG "readcpuinfo failed " | 229 | pr_warning("readcpuinfo failed (response=0x%04x)\n", |
228 | "(response=0x%04x)\n", sccb->header.response_code); | 230 | sccb->header.response_code); |
229 | rc = -EIO; | 231 | rc = -EIO; |
230 | goto out; | 232 | goto out; |
231 | } | 233 | } |
@@ -262,8 +264,9 @@ static int do_cpu_configure(sclp_cmdw_t cmd) | |||
262 | case 0x0120: | 264 | case 0x0120: |
263 | break; | 265 | break; |
264 | default: | 266 | default: |
265 | printk(KERN_WARNING TAG "configure cpu failed (cmd=0x%08x, " | 267 | pr_warning("configure cpu failed (cmd=0x%08x, " |
266 | "response=0x%04x)\n", cmd, sccb->header.response_code); | 268 | "response=0x%04x)\n", cmd, |
269 | sccb->header.response_code); | ||
267 | rc = -EIO; | 270 | rc = -EIO; |
268 | break; | 271 | break; |
269 | } | 272 | } |
@@ -626,9 +629,9 @@ static int do_chp_configure(sclp_cmdw_t cmd) | |||
626 | case 0x0450: | 629 | case 0x0450: |
627 | break; | 630 | break; |
628 | default: | 631 | default: |
629 | printk(KERN_WARNING TAG "configure channel-path failed " | 632 | pr_warning("configure channel-path failed " |
630 | "(cmd=0x%08x, response=0x%04x)\n", cmd, | 633 | "(cmd=0x%08x, response=0x%04x)\n", cmd, |
631 | sccb->header.response_code); | 634 | sccb->header.response_code); |
632 | rc = -EIO; | 635 | rc = -EIO; |
633 | break; | 636 | break; |
634 | } | 637 | } |
@@ -695,8 +698,8 @@ int sclp_chp_read_info(struct sclp_chp_info *info) | |||
695 | if (rc) | 698 | if (rc) |
696 | goto out; | 699 | goto out; |
697 | if (sccb->header.response_code != 0x0010) { | 700 | if (sccb->header.response_code != 0x0010) { |
698 | printk(KERN_WARNING TAG "read channel-path info failed " | 701 | pr_warning("read channel-path info failed " |
699 | "(response=0x%04x)\n", sccb->header.response_code); | 702 | "(response=0x%04x)\n", sccb->header.response_code); |
700 | rc = -EIO; | 703 | rc = -EIO; |
701 | goto out; | 704 | goto out; |
702 | } | 705 | } |