Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f55495ba authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

[S390] convert hypfs printks to pr_xxx macros. 



Signed-off-by: default avatarMichael Holzheu <holzheu@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent feab6501

arch/s390/hypfs/hypfs_diag.c

+7 −3
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 
 *    Hypervisor filesystem for Linux on s390. Diag 204 and 224

 *    implementation.

 *

 *    Copyright (C) IBM Corp. 2006

 *    Copyright IBM Corp. 2006, 2008

 *    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/errno.h>

#include <linux/string.h>
@@ -527,13 +530,14 @@ __init int hypfs_diag_init(void) 
	int rc;



	if (diag204_probe()) {

		printk(KERN_ERR "hypfs: diag 204 not working.");

		pr_err("The hardware system does not support hypfs\n");

		return -ENODATA;

	}

	rc = diag224_get_name_table();

	if (rc) {

		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;

}

arch/s390/hypfs/inode.c

+8 −6
Original line number Diff line number Diff line
@@ -2,10 +2,13 @@ 
 *  arch/s390/hypfs/inode.c

 *    Hypervisor filesystem for Linux on s390.

 *

 *    Copyright (C) IBM Corp. 2006

 *    Copyright IBM Corp. 2006, 2008

 *    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/errno.h>

#include <linux/fs.h>
@@ -200,7 +203,7 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov, 
	else

		rc = hypfs_diag_create_files(sb, sb->s_root);

	if (rc) {

		printk(KERN_ERR "hypfs: Update failed\n");

		pr_err("Updating the hypfs tree failed\n");

		hypfs_delete_tree(sb->s_root);

		goto out;

	}
@@ -252,8 +255,7 @@ static int hypfs_parse_options(char *options, struct super_block *sb) 
			break;

		case opt_err:

		default:

			printk(KERN_ERR "hypfs: Unrecognized mount option "

			       "\"%s\" or missing value\n", str);

			pr_err("%s is not a valid mount option\n", str);

			return -EINVAL;

		}

	}
@@ -317,7 +319,7 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent) 
	}

	hypfs_update_update(sb);

	sb->s_root = root_dentry;

	printk(KERN_INFO "hypfs: Hypervisor filesystem mounted\n");

	pr_info("Hypervisor filesystem mounted\n");

	return 0;



err_tree:
@@ -513,7 +515,7 @@ static int __init hypfs_init(void) 
	if (!MACHINE_IS_VM)

		hypfs_diag_exit();

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;

}