fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / s390 / char / sclp_cpi.c

diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c
index 232182d..4f873ae 100644 (file)
--- a/drivers/s390/char/sclp_cpi.c
+++ b/drivers/s390/char/sclp_cpi.c
@@ -5,7 +5,6 @@
  * SCLP Control-Program Identification.
  */
 
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/kmod.h>
 #include <linux/module.h>
@@ -50,6 +49,8 @@ static struct sclp_register sclp_cpi_event =
        .send_mask = EvTyp_CtlProgIdent_Mask
 };
 
+MODULE_LICENSE("GPL");
+
 MODULE_AUTHOR(
        "Martin Peschke, IBM Deutschland Entwicklung GmbH "
        "<mpeschke@de.ibm.com>");
@@ -128,7 +129,7 @@ cpi_prepare_req(void)
        struct cpi_sccb *sccb;
        struct cpi_evbuf *evb;
 
-       req = (struct sclp_req *) kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
+       req = kmalloc(sizeof(struct sclp_req), GFP_KERNEL);
        if (req == NULL)
                return ERR_PTR(-ENOMEM);
        sccb = (struct cpi_sccb *) __get_free_page(GFP_KERNEL | GFP_DMA);
@@ -196,18 +197,20 @@ cpi_module_init(void)
        rc = sclp_register(&sclp_cpi_event);
        if (rc) {
                /* could not register sclp event. Die. */
-               printk("cpi: could not register to hardware console.\n");
+               printk(KERN_WARNING "cpi: could not register to hardware "
+                      "console.\n");
                return -EINVAL;
        }
        if (!(sclp_cpi_event.sclp_send_mask & EvTyp_CtlProgIdent_Mask)) {
-               printk("cpi: no control program identification support\n");
+               printk(KERN_WARNING "cpi: no control program identification "
+                      "support\n");
                sclp_unregister(&sclp_cpi_event);
-               return -ENOTSUPP;
+               return -EOPNOTSUPP;
        }
 
        req = cpi_prepare_req();
        if (IS_ERR(req)) {
-               printk("cpi: couldn't allocate request\n");
+               printk(KERN_WARNING "cpi: couldn't allocate request\n");
                sclp_unregister(&sclp_cpi_event);
                return PTR_ERR(req);
        }
@@ -216,13 +219,20 @@ cpi_module_init(void)
        sema_init(&sem, 0);
        req->callback_data = &sem;
        /* Add request to sclp queue */
-       sclp_add_request(req);
+       rc = sclp_add_request(req);
+       if (rc) {
+               printk(KERN_WARNING "cpi: could not start request\n");
+               cpi_free_req(req);
+               sclp_unregister(&sclp_cpi_event);
+               return rc;
+       }
        /* make "insmod" sleep until callback arrives */
        down(&sem);
 
        rc = ((struct cpi_sccb *) req->sccb)->header.response_code;
        if (rc != 0x0020) {
-               printk("cpi: failed with response code 0x%x\n", rc);
+               printk(KERN_WARNING "cpi: failed with response code 0x%x\n",
+                      rc);
                rc = -ECOMM;
        } else
                rc = 0;