From 577022fcf77ffe3454e6886e2dd406f6460e741e Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 14 Jul 2008 09:59:25 +0200
Subject: [PATCH] --- yaml --- r: 98993 b: refs/heads/master c:
 a26182ed7171bff74caf5a55d4d3bdd6f400dfb5 h: refs/heads/master i:   98991:
 62b47f3490f2bfac0bc33a3410d32deb376ef762 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/s390/char/fs3270.c  | 5 +----
 trunk/drivers/s390/char/raw3270.c | 1 -
 trunk/drivers/s390/char/tty3270.c | 3 ---
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2523d4588810..74ef6124c08f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df22b4b39c6a1679f471bd68f97cf6f6819571a
+refs/heads/master: a26182ed7171bff74caf5a55d4d3bdd6f400dfb5
diff --git a/trunk/drivers/s390/char/fs3270.c b/trunk/drivers/s390/char/fs3270.c
index f0d67af96402..e136d10a0de6 100644
--- a/trunk/drivers/s390/char/fs3270.c
+++ b/trunk/drivers/s390/char/fs3270.c
@@ -512,11 +512,8 @@ fs3270_init(void)
 	int rc;
 
 	rc = register_chrdev(IBM_FS3270_MAJOR, "fs3270", &fs3270_fops);
-	if (rc) {
-		printk(KERN_ERR "fs3270 can't get major number %d: errno %d\n",
-		       IBM_FS3270_MAJOR, rc);
+	if (rc)
 		return rc;
-	}
 	return 0;
 }
 
diff --git a/trunk/drivers/s390/char/raw3270.c b/trunk/drivers/s390/char/raw3270.c
index e2767e3b8cfd..81a96e019080 100644
--- a/trunk/drivers/s390/char/raw3270.c
+++ b/trunk/drivers/s390/char/raw3270.c
@@ -610,7 +610,6 @@ __raw3270_size_device_vm(struct raw3270 *rp)
 		rp->cols = 132;
 		break;
 	default:
-		printk(KERN_WARNING "vrdccrmd is 0x%.8x\n", model);
 		rc = -EOPNOTSUPP;
 		break;
 	}
diff --git a/trunk/drivers/s390/char/tty3270.c b/trunk/drivers/s390/char/tty3270.c
index e4ba8bdce32e..a7fe6302c982 100644
--- a/trunk/drivers/s390/char/tty3270.c
+++ b/trunk/drivers/s390/char/tty3270.c
@@ -1792,15 +1792,12 @@ static int __init tty3270_init(void)
 	tty_set_operations(driver, &tty3270_ops);
 	ret = tty_register_driver(driver);
 	if (ret) {
-		printk(KERN_ERR "tty3270 registration failed with %d\n", ret);
 		put_tty_driver(driver);
 		return ret;
 	}
 	tty3270_driver = driver;
 	ret = raw3270_register_notifier(tty3270_notifier);
 	if (ret) {
-		printk(KERN_ERR "tty3270 notifier registration failed "
-		       "with %d\n", ret);
 		put_tty_driver(driver);
 		return ret;