Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / sclp_quiesce.c

diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index baa8fe669ed206240280e3619503a536b33ac220..84c191c1cd620fa1e5a723dcb060f9a8d4ae9175 100644 (file)
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -43,7 +43,7 @@ sclp_quiesce_handler(struct evbuf_header *evbuf)
 }
 
 static struct sclp_register sclp_quiesce_event = {
-       .receive_mask = EvTyp_SigQuiesce_Mask,
+       .receive_mask = EVTYP_SIGQUIESCE_MASK,
        .receiver_fn = sclp_quiesce_handler
 };
 
@@ -51,13 +51,7 @@ static struct sclp_register sclp_quiesce_event = {
 static int __init
 sclp_quiesce_init(void)
 {
-       int rc;
-
-       rc = sclp_register(&sclp_quiesce_event);
-       if (rc)
-               printk(KERN_WARNING "sclp: could not register quiesce handler "
-                      "(rc=%d)\n", rc);
-       return rc;
+       return sclp_register(&sclp_quiesce_event);
 }
 
 module_init(sclp_quiesce_init);