power: rk81x-battery: modify low power check threshold voltage

[firefly-linux-kernel-4.4.55.git] / drivers / gator / gator_events_block.c

diff --git a/drivers/gator/gator_events_block.c b/drivers/gator/gator_events_block.c
index 03eed4fb9ebb057003e0e5d7b8e61f14490ba69e..b3467b1337120ec6612aa73c5615c42aab27ff0d 100644 (file)
--- a/drivers/gator/gator_events_block.c
+++ b/drivers/gator/gator_events_block.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) ARM Limited 2010-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2010-2015. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -28,7 +28,7 @@ static ulong block_rq_rd_key;
 static atomic_t blockCnt[BLOCK_TOTAL];
 static int blockGet[BLOCK_TOTAL * 4];
 
-// Tracepoint changed in 3.15 backported to older kernels. The Makefile tries to autodetect the correct value, but if it fails change the #if below
+/* Tracepoint changed in 3.15 backported to older kernels. The Makefile tries to autodetect the correct value, but if it fails change the #if below */
 #if OLD_BLOCK_RQ_COMPLETE
 GATOR_DEFINE_PROBE(block_rq_complete, TP_PROTO(struct request_queue *q, struct request *rq))
 #else
@@ -52,13 +52,11 @@ GATOR_DEFINE_PROBE(block_rq_complete, TP_PROTO(struct request_queue *q, struct r
                return;
 
        if (write) {
-               if (block_rq_wr_enabled) {
+               if (block_rq_wr_enabled)
                        atomic_add(size, &blockCnt[BLOCK_RQ_WR]);
-               }
        } else {
-               if (block_rq_rd_enabled) {
+               if (block_rq_rd_enabled)
                        atomic_add(size, &blockCnt[BLOCK_RQ_RD]);
-               }
        }
 }
 
@@ -68,17 +66,15 @@ static int gator_events_block_create_files(struct super_block *sb, struct dentry
 
        /* block_complete_wr */
        dir = gatorfs_mkdir(sb, root, "Linux_block_rq_wr");
-       if (!dir) {
+       if (!dir)
                return -1;
-       }
        gatorfs_create_ulong(sb, dir, "enabled", &block_rq_wr_enabled);
        gatorfs_create_ro_ulong(sb, dir, "key", &block_rq_wr_key);
 
        /* block_complete_rd */
        dir = gatorfs_mkdir(sb, root, "Linux_block_rq_rd");
-       if (!dir) {
+       if (!dir)
                return -1;
-       }
        gatorfs_create_ulong(sb, dir, "enabled", &block_rq_rd_enabled);
        gatorfs_create_ro_ulong(sb, dir, "key", &block_rq_rd_key);
 
@@ -87,7 +83,7 @@ static int gator_events_block_create_files(struct super_block *sb, struct dentry
 
 static int gator_events_block_start(void)
 {
-       // register tracepoints
+       /* register tracepoints */
        if (block_rq_wr_enabled || block_rq_rd_enabled)
                if (GATOR_REGISTER_TRACE(block_rq_complete))
                        goto fail_block_rq_exit;
@@ -95,7 +91,7 @@ static int gator_events_block_start(void)
 
        return 0;
 
-       // unregister tracepoints on error
+       /* unregister tracepoints on error */
 fail_block_rq_exit:
        pr_err("gator: block event tracepoints failed to activate, please verify that tracepoints are enabled in the linux kernel\n");
 
@@ -112,19 +108,19 @@ static void gator_events_block_stop(void)
        block_rq_rd_enabled = 0;
 }
 
-static int gator_events_block_read(int **buffer)
+static int gator_events_block_read(int **buffer, bool sched_switch)
 {
        int len, value, data = 0;
 
-       if (!on_primary_core()) {
+       if (!on_primary_core())
                return 0;
-       }
 
        len = 0;
        if (block_rq_wr_enabled && (value = atomic_read(&blockCnt[BLOCK_RQ_WR])) > 0) {
                atomic_sub(value, &blockCnt[BLOCK_RQ_WR]);
                blockGet[len++] = block_rq_wr_key;
-               blockGet[len++] = 0;    // indicates to Streamline that value bytes were written now, not since the last message
+               /* Indicates to Streamline that value bytes were written now, not since the last message */
+               blockGet[len++] = 0;
                blockGet[len++] = block_rq_wr_key;
                blockGet[len++] = value;
                data += value;
@@ -132,7 +128,8 @@ static int gator_events_block_read(int **buffer)
        if (block_rq_rd_enabled && (value = atomic_read(&blockCnt[BLOCK_RQ_RD])) > 0) {
                atomic_sub(value, &blockCnt[BLOCK_RQ_RD]);
                blockGet[len++] = block_rq_rd_key;
-               blockGet[len++] = 0;    // indicates to Streamline that value bytes were read now, not since the last message
+               /* Indicates to Streamline that value bytes were read now, not since the last message */
+               blockGet[len++] = 0;
                blockGet[len++] = block_rq_rd_key;
                blockGet[len++] = value;
                data += value;