4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c
index 5a6cef2dfa13..80f7f31310e6 100644
--- a/drivers/s390/char/sclp_cpi.c
+++ b/drivers/s390/char/sclp_cpi.c
@@ -204,7 +204,7 @@ cpi_module_init(void)
                 printk(KERN_WARNING "cpi: no control program identification "
                        "support\n");
                 sclp_unregister(&sclp_cpi_event);
-                return -ENOTSUPP;
+                return -EOPNOTSUPP;
         }
 
         req = cpi_prepare_req();
diff --git a/drivers/s390/char/sclp_quiesce.c b/drivers/s390/char/sclp_quiesce.c
index 83f75774df60..56fa69168898 100644
--- a/drivers/s390/char/sclp_quiesce.c
+++ b/drivers/s390/char/sclp_quiesce.c
@@ -32,7 +32,7 @@ do_load_quiesce_psw(void * __unused)
         psw_t quiesce_psw;
         int cpu;
 
-        if (atomic_compare_and_swap(-1, smp_processor_id(), &cpuid))
+        if (atomic_cmpxchg(&cpuid, -1, smp_processor_id()) != -1)
                 signal_processor(smp_processor_id(), sigp_stop);
         /* Wait for all other cpus to enter stopped state */
         for_each_online_cpu(cpu) {
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 1efc9f21229e..5ced2725d6c7 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -65,7 +65,7 @@ static void
 tapeblock_trigger_requeue(struct tape_device *device)
 {
         /* Protect against rescheduling. */
-        if (atomic_compare_and_swap(0, 1, &device->blk_data.requeue_scheduled))
+        if (atomic_cmpxchg(&device->blk_data.requeue_scheduled, 0, 1) != 0)
                 return;
         schedule_work(&device->blk_data.requeue_task);
 }
@@ -78,7 +78,7 @@ tapeblock_end_request(struct request *req, int uptodate)
 {
         if (end_that_request_first(req, uptodate, req->hard_nr_sectors))
                 BUG();
-        end_that_request_last(req);
+        end_that_request_last(req, uptodate);
 }
 
 static void
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 5473c23fcb52..5acc0ace3d7d 100644
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -66,7 +66,7 @@ static int __diag288(enum vmwdt_func func, unsigned int timeout,
         __cmdl = len;
         err = 0;
         asm volatile (
-#ifdef __s390x__
+#ifdef CONFIG_64BIT
                        "diag %2,%4,0x288\n"
                 "1:     \n"
                 ".section .fixup,\"ax\"\n"