Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[S390] convert hypfs printks to pr_xxx macros.

Browse Source 
Signed-off-by: Michael Holzheu <holzheu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Michael Holzheu 2008-12-25 13:39:39 +01:00 committed by Martin Schwidefsky
parent feab6501d8
commit f55495ba1a
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/s390/hypfs/hypfs_diag.c
View File

@ -3,10 +3,13 @@
* Hypervisor filesystem for Linux on s390. Diag 204 and 224 * Hypervisor filesystem for Linux on s390. Diag 204 and 224
* implementation. * implementation.
* *
* Copyright (C) IBM Corp. 2006 * Copyright IBM Corp. 2006, 2008
* Author(s): Michael Holzheu <holzheu@de.ibm.com> * Author(s): Michael Holzheu <holzheu@de.ibm.com>
*/ */
#define KMSG_COMPONENT "hypfs"
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/string.h> #include <linux/string.h>
@ -527,13 +530,14 @@ __init int hypfs_diag_init(void)
int rc; int rc;
if (diag204_probe()) { if (diag204_probe()) {
printk(KERN_ERR "hypfs: diag 204 not working."); pr_err("The hardware system does not support hypfs\n");
return -ENODATA; return -ENODATA;
} }
rc = diag224_get_name_table(); rc = diag224_get_name_table();
if (rc) { if (rc) {
diag204_free_buffer(); diag204_free_buffer();
printk(KERN_ERR "hypfs: could not get name table.\n"); pr_err("The hardware system does not provide all "
"functions required by hypfs\n");
} }
return rc; return rc;
} }

14
arch/s390/hypfs/inode.c
View File

@ -2,10 +2,13 @@
* arch/s390/hypfs/inode.c * arch/s390/hypfs/inode.c
* Hypervisor filesystem for Linux on s390. * Hypervisor filesystem for Linux on s390.
* *
* Copyright (C) IBM Corp. 2006 * Copyright IBM Corp. 2006, 2008
* Author(s): Michael Holzheu <holzheu@de.ibm.com> * Author(s): Michael Holzheu <holzheu@de.ibm.com>
*/ */
#define KMSG_COMPONENT "hypfs"
#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/fs.h> #include <linux/fs.h>
@ -200,7 +203,7 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
else else
rc = hypfs_diag_create_files(sb, sb->s_root); rc = hypfs_diag_create_files(sb, sb->s_root);
if (rc) { if (rc) {
printk(KERN_ERR "hypfs: Update failed\n"); pr_err("Updating the hypfs tree failed\n");
hypfs_delete_tree(sb->s_root); hypfs_delete_tree(sb->s_root);
goto out; goto out;
} }
@ -252,8 +255,7 @@ static int hypfs_parse_options(char *options, struct super_block *sb)
break; break;
case opt_err: case opt_err:
default: default:
printk(KERN_ERR "hypfs: Unrecognized mount option " pr_err("%s is not a valid mount option\n", str);
"\"%s\" or missing value\n", str);
return -EINVAL; return -EINVAL;
} }
} }
@ -317,7 +319,7 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
} }
hypfs_update_update(sb); hypfs_update_update(sb);
sb->s_root = root_dentry; sb->s_root = root_dentry;
printk(KERN_INFO "hypfs: Hypervisor filesystem mounted\n"); pr_info("Hypervisor filesystem mounted\n");
return 0; return 0;
err_tree: err_tree:
@ -513,7 +515,7 @@ fail_sysfs:
if (!MACHINE_IS_VM) if (!MACHINE_IS_VM)
hypfs_diag_exit(); hypfs_diag_exit();
fail_diag: fail_diag:
printk(KERN_ERR "hypfs: Initialization failed with rc = %i.\n", rc); pr_err("Initialization of hypfs failed with rc=%i\n", rc);
return rc; return rc;
} }