1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index ebab6ea4659b..883f16f96f22 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -19,8 +19,8 @@
 #include <asm/cio.h>
 #include <asm/chpid.h>
 #include <asm/chsc.h>
+#include <asm/crw.h>
 
-#include "../s390mach.h"
 #include "css.h"
 #include "cio.h"
 #include "cio_debug.h"
@@ -589,6 +589,7 @@ __chsc_do_secm(struct channel_subsystem *css, int enable, void *page)
         case 0x0102:
         case 0x0103:
                 ret = -EINVAL;
+                break;
         default:
                 ret = chsc_error_from_response(secm_area->response.code);
         }
@@ -820,7 +821,7 @@ int __init chsc_alloc_sei_area(void)
                               "chsc machine checks!\n");
                 return -ENOMEM;
         }
-        ret = s390_register_crw_handler(CRW_RSC_CSS, chsc_process_crw);
+        ret = crw_register_handler(CRW_RSC_CSS, chsc_process_crw);
         if (ret)
                 kfree(sei_page);
         return ret;
@@ -828,7 +829,7 @@ int __init chsc_alloc_sei_area(void)
 
 void __init chsc_free_sei_area(void)
 {
-        s390_unregister_crw_handler(CRW_RSC_CSS);
+        crw_unregister_handler(CRW_RSC_CSS);
         kfree(sei_page);
 }